Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TNL-1353: Fix annotator dependency.

Browse Source
This commit is contained in:
polesye
2015-02-05 14:53:39 +02:00
parent f8130cc68e
commit c88aad557a
13 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/js/edxnotes/plugins/events.js
View File

@@ -1,7 +1,7 @@
;(function (define, undefined) {
'use strict';
define([
'underscore', 'annotator', 'underscore.string'
'underscore', 'annotator_1.2.9', 'underscore.string'
], function (_, Annotator) {
/**
* Modifies Annotator.Plugin.Store.annotationCreated to make it trigger a new

2
lms/static/js/edxnotes/plugins/scroller.js
View File

@@ -1,6 +1,6 @@
;(function (define, undefined) {
'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
* opens it.

2
lms/static/js/edxnotes/views/notes_factory.js
View File

@@ -1,7 +1,7 @@
;(function (define, undefined) {
'use strict';
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/plugins/events'
], function ($, _, Annotator, NotesLogger) {

2
lms/static/js/edxnotes/views/shim.js
View File

@@ -1,7 +1,7 @@
;(function (define, undefined) {
'use strict';
define([
'jquery', 'underscore', 'annotator', 'js/edxnotes/utils/utils'
'jquery', 'underscore', 'annotator_1.2.9', 'js/edxnotes/utils/utils'
], function ($, _, Annotator, Utils) {
var _t = Annotator._t;

2
lms/static/js/edxnotes/views/toggle_notes_factory.js
View File

@@ -2,7 +2,7 @@
'use strict';
define([
'jquery', 'underscore', 'backbone', 'gettext',
'annotator', 'js/edxnotes/views/visibility_decorator'
'annotator_1.2.9', 'js/edxnotes/views/visibility_decorator'
], function($, _, Backbone, gettext, Annotator, EdxnotesVisibilityDecorator) {
var ToggleNotesView = Backbone.View.extend({
events: {

2
lms/static/js/spec/edxnotes/plugins/events_spec.js
View File

@@ -1,6 +1,6 @@
define([
'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) {
'use strict';
describe('EdxNotes Events Plugin', function() {

2
lms/static/js/spec/edxnotes/plugins/scroller_spec.js
View File

@@ -1,5 +1,5 @@
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'
], function($, _, Annotator, NotesFactory, customMatchers) {
'use strict';

2
lms/static/js/spec/edxnotes/views/notes_factory_spec.js
View File

@@ -1,5 +1,5 @@
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'
], function(Annotator, NotesFactory, AjaxHelpers, Helpers, customMatchers) {
'use strict';

2
lms/static/js/spec/edxnotes/views/shim_spec.js
View File

@@ -1,5 +1,5 @@
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) {
'use strict';
describe('EdxNotes Shim', function() {

2
lms/static/js/spec/edxnotes/views/toggle_notes_factory_spec.js
View File

@@ -1,5 +1,5 @@
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/spec/edxnotes/custom_matchers', 'jasmine-jquery'
], function(

2
lms/static/js/spec/edxnotes/views/visibility_decorator_spec.js
View File

@@ -1,5 +1,5 @@
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'
], function(Annotator, VisibilityDecorator, Helpers, customMatchers) {
'use strict';

4
lms/static/js/spec/main.js
View File

@@ -82,7 +82,7 @@
'js/student_profile/profile': 'js/student_profile/profile',
// 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: {
'gettext': {
@@ -511,7 +511,7 @@
]
},
// Student Notes
'annotator': {
'annotator_1.2.9': {
exports: 'Annotator',
deps: ['jquery']
}

5
lms/static/require-config-lms.js
View File

@@ -145,11 +145,6 @@
]
},
// End of needed by OVA
},
map: {
"js/edxnotes/*": {
"annotator": "annotator_1.2.9"
}
}
};