Commit c88aad55 by polesye

TNL-1353: Fix annotator dependency.

parent f8130cc6
;(function (define, undefined) { ;(function (define, undefined) {
'use strict'; 'use strict';
define([ define([
'underscore', 'annotator', 'underscore.string' 'underscore', 'annotator_1.2.9', 'underscore.string'
], function (_, Annotator) { ], function (_, Annotator) {
/** /**
* Modifies Annotator.Plugin.Store.annotationCreated to make it trigger a new * Modifies Annotator.Plugin.Store.annotationCreated to make it trigger a new
......
;(function (define, undefined) { ;(function (define, undefined) {
'use strict'; 'use strict';
define(['jquery', 'underscore', 'annotator'], function ($, _, Annotator) { define(['jquery', 'underscore', 'annotator_1.2.9'], function ($, _, Annotator) {
/** /**
* Adds the Scroller Plugin which scrolls to a note with a certain id and * Adds the Scroller Plugin which scrolls to a note with a certain id and
* opens it. * opens it.
......
;(function (define, undefined) { ;(function (define, undefined) {
'use strict'; 'use strict';
define([ define([
'jquery', 'underscore', 'annotator', 'js/edxnotes/utils/logger', 'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/utils/logger',
'js/edxnotes/views/shim', 'js/edxnotes/plugins/scroller', 'js/edxnotes/views/shim', 'js/edxnotes/plugins/scroller',
'js/edxnotes/plugins/events' 'js/edxnotes/plugins/events'
], function ($, _, Annotator, NotesLogger) { ], function ($, _, Annotator, NotesLogger) {
......
;(function (define, undefined) { ;(function (define, undefined) {
'use strict'; 'use strict';
define([ define([
'jquery', 'underscore', 'annotator', 'js/edxnotes/utils/utils' 'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/utils/utils'
], function ($, _, Annotator, Utils) { ], function ($, _, Annotator, Utils) {
var _t = Annotator._t; var _t = Annotator._t;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
'use strict'; 'use strict';
define([ define([
'jquery', 'underscore', 'backbone', 'gettext', 'jquery', 'underscore', 'backbone', 'gettext',
'annotator', 'js/edxnotes/views/visibility_decorator' 'annotator_1.2.9', 'js/edxnotes/views/visibility_decorator'
], function($, _, Backbone, gettext, Annotator, EdxnotesVisibilityDecorator) { ], function($, _, Backbone, gettext, Annotator, EdxnotesVisibilityDecorator) {
var ToggleNotesView = Backbone.View.extend({ var ToggleNotesView = Backbone.View.extend({
events: { events: {
......
define([ define([
'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'js/spec/edxnotes/helpers', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'js/spec/edxnotes/helpers',
'annotator', 'logger', 'js/edxnotes/views/notes_factory' 'annotator_1.2.9', 'logger', 'js/edxnotes/views/notes_factory'
], function($, _, AjaxHelpers, Helpers, Annotator, Logger, NotesFactory) { ], function($, _, AjaxHelpers, Helpers, Annotator, Logger, NotesFactory) {
'use strict'; 'use strict';
describe('EdxNotes Events Plugin', function() { describe('EdxNotes Events Plugin', function() {
......
define([ define([
'jquery', 'underscore', 'annotator', 'js/edxnotes/views/notes_factory', 'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/views/notes_factory',
'js/spec/edxnotes/custom_matchers' 'js/spec/edxnotes/custom_matchers'
], function($, _, Annotator, NotesFactory, customMatchers) { ], function($, _, Annotator, NotesFactory, customMatchers) {
'use strict'; 'use strict';
......
define([ define([
'annotator', 'js/edxnotes/views/notes_factory', 'js/common_helpers/ajax_helpers', 'annotator_1.2.9', 'js/edxnotes/views/notes_factory', 'js/common_helpers/ajax_helpers',
'js/spec/edxnotes/helpers', 'js/spec/edxnotes/custom_matchers' 'js/spec/edxnotes/helpers', 'js/spec/edxnotes/custom_matchers'
], function(Annotator, NotesFactory, AjaxHelpers, Helpers, customMatchers) { ], function(Annotator, NotesFactory, AjaxHelpers, Helpers, customMatchers) {
'use strict'; 'use strict';
......
define([ define([
'jquery', 'underscore', 'annotator', 'js/edxnotes/views/notes_factory', 'jasmine-jquery' 'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/views/notes_factory', 'jasmine-jquery'
], function($, _, Annotator, NotesFactory) { ], function($, _, Annotator, NotesFactory) {
'use strict'; 'use strict';
describe('EdxNotes Shim', function() { describe('EdxNotes Shim', function() {
......
define([ define([
'jquery', 'annotator', 'js/common_helpers/ajax_helpers', 'js/edxnotes/views/visibility_decorator', 'jquery', 'annotator_1.2.9', 'js/common_helpers/ajax_helpers', 'js/edxnotes/views/visibility_decorator',
'js/edxnotes/views/toggle_notes_factory', 'js/spec/edxnotes/helpers', 'js/edxnotes/views/toggle_notes_factory', 'js/spec/edxnotes/helpers',
'js/spec/edxnotes/custom_matchers', 'jasmine-jquery' 'js/spec/edxnotes/custom_matchers', 'jasmine-jquery'
], function( ], function(
......
define([ define([
'annotator', 'js/edxnotes/views/visibility_decorator', 'annotator_1.2.9', 'js/edxnotes/views/visibility_decorator',
'js/spec/edxnotes/helpers', 'js/spec/edxnotes/custom_matchers' 'js/spec/edxnotes/helpers', 'js/spec/edxnotes/custom_matchers'
], function(Annotator, VisibilityDecorator, Helpers, customMatchers) { ], function(Annotator, VisibilityDecorator, Helpers, customMatchers) {
'use strict'; 'use strict';
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
'js/student_profile/profile': 'js/student_profile/profile', 'js/student_profile/profile': 'js/student_profile/profile',
// edxnotes // edxnotes
'annotator': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min' 'annotator_1.2.9': 'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min'
}, },
shim: { shim: {
'gettext': { 'gettext': {
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
] ]
}, },
// Student Notes // Student Notes
'annotator': { 'annotator_1.2.9': {
exports: 'Annotator', exports: 'Annotator',
deps: ['jquery'] deps: ['jquery']
} }
......
...@@ -145,11 +145,6 @@ ...@@ -145,11 +145,6 @@
] ]
}, },
// End of needed by OVA // End of needed by OVA
},
map: {
"js/edxnotes/*": {
"annotator": "annotator_1.2.9"
}
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment