Skip to content

E
edx-platform
Commit 27d4e4bd by Felipe Montoya
Options

Compiling cms/coffee/src/main into a js file and fixing the references 

Linting
parent df1d4ea8
Showing with 169 additions and 131 deletions
cms/static/cms/js/require-config.js
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
exports: 'XBlock', exports: 'XBlock',
deps: ['xblock/core'] deps: ['xblock/core']
}, },
'coffee/src/main': { 'js/main': {
deps: ['coffee/src/ajax_prefix'] deps: ['coffee/src/ajax_prefix']
}, },
'js/src/logger': { 'js/src/logger': {
......
cms/static/cms/js/spec/main.js
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
'mock-ajax': { 'mock-ajax': {
deps: ['jquery'] deps: ['jquery']
}, },
'coffee/src/main': { 'js/main': {
deps: ['coffee/src/ajax_prefix'] deps: ['coffee/src/ajax_prefix']
}, },
'coffee/src/ajax_prefix': { 'coffee/src/ajax_prefix': {
...@@ -218,7 +218,6 @@ ...@@ -218,7 +218,6 @@
testFiles = [ testFiles = [
'cms/js/spec/xblock/cms.runtime.v1_spec', 'cms/js/spec/xblock/cms.runtime.v1_spec',
'coffee/spec/main_spec',
'coffee/spec/models/course_spec', 'coffee/spec/models/course_spec',
'coffee/spec/models/metadata_spec', 'coffee/spec/models/metadata_spec',
'coffee/spec/models/section_spec', 'coffee/spec/models/section_spec',
...@@ -230,6 +229,7 @@ ...@@ -230,6 +229,7 @@
'coffee/spec/views/metadata_edit_spec', 'coffee/spec/views/metadata_edit_spec',
'coffee/spec/views/textbook_spec', 'coffee/spec/views/textbook_spec',
'coffee/spec/views/upload_spec', 'coffee/spec/views/upload_spec',
'js/spec/main_spec',
'js/spec/video/transcripts/utils_spec', 'js/spec/video/transcripts/utils_spec',
'js/spec/video/transcripts/editor_spec', 'js/spec/video/transcripts/editor_spec',
'js/spec/video/transcripts/videolist_spec', 'js/spec/video/transcripts/videolist_spec',
......
cms/static/cms/js/spec/main_squire.js
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
exports: 'XBlock', exports: 'XBlock',
deps: ['xblock/core'] deps: ['xblock/core']
}, },
'coffee/src/main': { 'js/main': {
deps: ['coffee/src/ajax_prefix'] deps: ['coffee/src/ajax_prefix']
}, },
'coffee/src/ajax_prefix': { 'coffee/src/ajax_prefix': {
......
cms/static/coffee/spec/models/textbook_spec.coffee
define ["backbone", "js/models/textbook", "js/collections/textbook", "js/models/chapter", "js/collections/chapter", "coffee/src/main"],
define ["backbone", "js/models/textbook", "js/collections/textbook", "js/models/chapter", "js/collections/chapter", "js/main"],
(Backbone, Textbook, TextbookSet, Chapter, ChapterSet, main) -> (Backbone, Textbook, TextbookSet, Chapter, ChapterSet, main) ->
describe "Textbook model", -> describe "Textbook model", ->
......
cms/static/coffee/spec/views/metadata_edit_spec.coffee
define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "coffee/src/main"], define ["js/models/metadata", "js/collections/metadata", "js/views/metadata", "js/main"],
(MetadataModel, MetadataCollection, MetadataView, main) -> (MetadataModel, MetadataCollection, MetadataView, main) ->
verifyInputType = (input, expectedType) -> verifyInputType = (input, expectedType) ->
# Some browsers (e.g. FireFox) do not support the "number" # Some browsers (e.g. FireFox) do not support the "number"
......
cms/static/js/certificates/models/certificate.js
...@@ -6,7 +6,7 @@ define([ ...@@ -6,7 +6,7 @@ define([
'backbone-relational', 'backbone-relational',
'backbone.associations', 'backbone.associations',
'gettext', 'gettext',
'coffee/src/main', 'js/main',
'js/certificates/models/signatory', 'js/certificates/models/signatory',
'js/certificates/collections/signatories' 'js/certificates/collections/signatories'
], ],
......
cms/static/js/factories/base.js
define(['js/base', 'coffee/src/main', 'js/src/logger', 'datepair', 'accessibility', define(['js/base', 'js/main', 'js/src/logger', 'datepair', 'accessibility',
'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']); 'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);
cms/static/js/factories/container.js
define([ define([
'jquery', 'underscore', 'js/models/xblock_container_info', 'js/views/pages/container', 'jquery', 'underscore', 'js/models/xblock_container_info', 'js/views/pages/container',
'js/collections/component_template', 'xmodule', 'coffee/src/main', 'js/collections/component_template', 'xmodule', 'js/main',
'xblock/cms.runtime.v1' 'xblock/cms.runtime.v1'
], ],
function($, _, XBlockContainerInfo, ContainerPage, ComponentTemplates, xmoduleLoader) { function($, _, XBlockContainerInfo, ContainerPage, ComponentTemplates, xmoduleLoader) {
......
cms/static/js/factories/edit_tabs.js
define([ define([
'js/models/explicit_url', 'js/views/tabs', 'xmodule', 'coffee/src/main', 'xblock/cms.runtime.v1' 'js/models/explicit_url', 'js/views/tabs', 'xmodule', 'js/main', 'xblock/cms.runtime.v1'
], function (TabsModel, TabsEditView, xmoduleLoader) { ], function (TabsModel, TabsEditView, xmoduleLoader) {
'use strict'; 'use strict';
return function (courseLocation, explicitUrl) { return function (courseLocation, explicitUrl) {
......
cms/static/js/factories/library.js
define([ define([
'jquery', 'underscore', 'js/models/xblock_info', 'js/views/pages/paged_container', 'jquery', 'underscore', 'js/models/xblock_info', 'js/views/pages/paged_container',
'js/views/library_container', 'js/collections/component_template', 'xmodule', 'coffee/src/main', 'js/views/library_container', 'js/collections/component_template', 'xmodule', 'js/main',
'xblock/cms.runtime.v1' 'xblock/cms.runtime.v1'
], ],
function($, _, XBlockInfo, PagedContainerPage, LibraryContainerView, ComponentTemplates, xmoduleLoader) { function($, _, XBlockInfo, PagedContainerPage, LibraryContainerView, ComponentTemplates, xmoduleLoader) {
......
cms/static/js/main.js
define ["domReady", "jquery", "underscore.string", "backbone", "gettext", (function(AjaxPrefix) {
"common/js/components/views/feedback_notification", 'use strict';
"coffee/src/ajax_prefix", "jquery.cookie"], define(['domReady', 'jquery', 'underscore.string', 'backbone', 'gettext',
(domReady, $, str, Backbone, gettext, NotificationView) -> 'common/js/components/views/feedback_notification', 'coffee/src/ajax_prefix',
main = -> 'jquery.cookie'],
AjaxPrefix.addAjaxPrefix jQuery, -> function(domReady, $, str, Backbone, gettext, NotificationView) {
$("meta[name='path_prefix']").attr('content') var main;
main = function() {
window.CMS = window.CMS or {} AjaxPrefix.addAjaxPrefix(jQuery, function() {
CMS.URL = CMS.URL or {} return $("meta[name='path_prefix']").attr('content');
window.onTouchBasedDevice = -> });
navigator.userAgent.match /iPhone|iPod|iPad|Android/i window.CMS = window.CMS || {};
window.CMS.URL = window.CMS.URL || {};
_.extend CMS, Backbone.Events window.onTouchBasedDevice = function() {
Backbone.emulateHTTP = true return navigator.userAgent.match(/iPhone|iPod|iPad|Android/i);
};
$.ajaxSetup _.extend(window.CMS, Backbone.Events);
headers : { 'X-CSRFToken': $.cookie 'csrftoken' } Backbone.emulateHTTP = true;
$.ajaxSetup({
headers: {
'X-CSRFToken': $.cookie('csrftoken')
},
dataType: 'json' dataType: 'json'
});
$(document).ajaxError (event, jqXHR, ajaxSettings, thrownError) -> $(document).ajaxError(function(event, jqXHR, ajaxSettings) {
if ajaxSettings.notifyOnError is false var message, msg;
return if (ajaxSettings.notifyOnError === false) {
if jqXHR.responseText return;
try }
message = JSON.parse(jqXHR.responseText).error if (jqXHR.responseText) {
catch error try {
message = str.truncate(jqXHR.responseText, 300) message = JSON.parse(jqXHR.responseText).error;
else } catch (error) {
message = gettext("This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.") message = str.truncate(jqXHR.responseText, 300);
msg = new NotificationView.Error( }
"title": gettext("Studio's having trouble saving your work") } else {
"message": message message = gettext('This may be happening because of an error with our server' +
) 'or your internet connection. Try refreshing the page or making' +
msg.show() 'sure you are online.');
}
$.postJSON = (url, data, callback) -> msg = new NotificationView.Error({
# shift arguments if data argument was omitted 'title': gettext("Studio's having trouble saving your work"),
if $.isFunction(data) 'message': message
callback = data });
data = `undefined` return msg.show();
$.ajax });
url: url $.postJSON = function(url, data, callback) {
type: "POST" if ($.isFunction(data)) {
contentType: "application/json; charset=utf-8" callback = data;
dataType: "json" data = undefined;
data: JSON.stringify(data) }
return $.ajax({
url: url,
type: 'POST',
contentType: 'application/json; charset=utf-8',
dataType: 'json',
data: JSON.stringify(data),
success: callback success: callback
});
};
return domReady(function() {
if (window.onTouchBasedDevice()) {
return $('body').addClass('touch-based-device');
}
});
};
main();
return main;
});
domReady -> }).call(this, AjaxPrefix); //jshint ignore:line
if onTouchBasedDevice()
$('body').addClass 'touch-based-device'
main()
return main
cms/static/js/models/group_configuration.js
define([ define([
'backbone', 'underscore', 'gettext', 'js/models/group', 'js/collections/group', 'backbone', 'underscore', 'gettext', 'js/models/group', 'js/collections/group',
'backbone.associations', 'coffee/src/main' 'backbone.associations', 'js/main'
], ],
function(Backbone, _, gettext, GroupModel, GroupCollection) { function(Backbone, _, gettext, GroupModel, GroupCollection) {
'use strict'; 'use strict';
......
cms/static/js/models/textbook.js
define(["backbone", "underscore", "gettext", "js/models/chapter", "js/collections/chapter", define(["backbone", "underscore", "gettext", "js/models/chapter", "js/collections/chapter",
"backbone.associations", "coffee/src/main"], "backbone.associations", "js/main"],
function(Backbone, _, gettext, ChapterModel, ChapterCollection) { function(Backbone, _, gettext, ChapterModel, ChapterCollection) {
var Textbook = Backbone.AssociatedModel.extend({ var Textbook = Backbone.AssociatedModel.extend({
......
cms/static/js/spec/main_spec.js
require ["jquery", "backbone", "coffee/src/main", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "jquery.cookie"], (function(sandbox) {
($, Backbone, main, AjaxHelpers) -> 'use strict';
describe "CMS", -> require(["jquery", "backbone", "js/main", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "jquery.cookie"],
it "should initialize URL", -> function($, Backbone, main, AjaxHelpers) {
expect(window.CMS.URL).toBeDefined() describe("CMS", function() {
return it("should initialize URL", function() {
describe "main helper", -> return expect(window.CMS.URL).toBeDefined();
beforeEach -> });
@previousAjaxSettings = $.extend(true, {}, $.ajaxSettings) });
spyOn($, "cookie").and.callFake( describe("main helper", function() {
(param) -> beforeEach(function() {
if param == "csrftoken" this.previousAjaxSettings = $.extend(true, {}, $.ajaxSettings);
return "stubCSRFToken" spyOn($, "cookie").and.callFake(function(param) {
) if (param === "csrftoken") {
return "stubCSRFToken";
main() }
});
afterEach -> return main();
$.ajaxSettings = @previousAjaxSettings });
afterEach(function() {
it "turn on Backbone emulateHTTP", -> $.ajaxSettings = this.previousAjaxSettings;
expect(Backbone.emulateHTTP).toBeTruthy() return $.ajaxSettings;
});
it "setup AJAX CSRF token", -> it("turn on Backbone emulateHTTP", function() {
expect($.ajaxSettings.headers["X-CSRFToken"]).toEqual("stubCSRFToken") return expect(Backbone.emulateHTTP).toBeTruthy();
});
describe "AJAX Errors", -> return it("setup AJAX CSRF token", function() {
server = null return expect($.ajaxSettings.headers["X-CSRFToken"]).toEqual("stubCSRFToken");
beforeEach -> });
appendSetFixtures(sandbox({id: "page-notification"})) });
describe("AJAX Errors", function() {
afterEach -> var server;
server && server.restore() server = null;
beforeEach(function() {
it "successful AJAX request does not pop an error notification", -> return appendSetFixtures(sandbox({
server = AjaxHelpers.server([200, {"Content-Type": "application/json"}, "{}"]) id: "page-notification"
}));
expect($("#page-notification")).toBeEmpty() });
$.ajax("/test") afterEach(function() {
expect($("#page-notification")).toBeEmpty() return server && server.restore();
server.respond() });
expect($("#page-notification")).toBeEmpty() it("successful AJAX request does not pop an error notification", function() {
server = AjaxHelpers.server([
it "AJAX request with error should pop an error notification", -> 200, {
server = AjaxHelpers.server([500, {"Content-Type": "application/json"}, "{}"]) "Content-Type": "application/json"
}, "{}"
$.ajax("/test") ]);
server.respond() expect($("#page-notification")).toBeEmpty();
expect($("#page-notification")).not.toBeEmpty() $.ajax("/test");
expect($("#page-notification")).toContainElement('div.wrapper-notification-error') expect($("#page-notification")).toBeEmpty();
server.respond();
it "can override AJAX request with error so it does not pop an error notification", -> return expect($("#page-notification")).toBeEmpty();
server = AjaxHelpers.server([500, {"Content-Type": "application/json"}, "{}"]) });
it("AJAX request with error should pop an error notification", function() {
$.ajax server = AjaxHelpers.server([
url: "/test" 500, {
"Content-Type": "application/json"
}, "{}"
]);
$.ajax("/test");
server.respond();
expect($("#page-notification")).not.toBeEmpty();
return expect($("#page-notification")).toContainElement('div.wrapper-notification-error');
});
it("can override AJAX request with error so it does not pop an error notification", function() {
server = AjaxHelpers.server([
500, {
"Content-Type": "application/json"
}, "{}"
]);
$.ajax({
url: "/test",
notifyOnError: false notifyOnError: false
});
server.respond();
return expect($("#page-notification")).toBeEmpty();
});
});
});
server.respond() }).call(this, sandbox); //jshint ignore:line
expect($("#page-notification")).toBeEmpty()
cms/static/js/spec/models/group_configuration_spec.js
define([ define([
'backbone', 'coffee/src/main', 'js/models/group_configuration', 'backbone', 'js/main', 'js/models/group_configuration',
'js/models/group', 'js/collections/group', 'squire' 'js/models/group', 'js/collections/group', 'squire'
], function (Backbone, main, GroupConfigurationModel, GroupModel, GroupCollection, Squire) { ], function (Backbone, main, GroupConfigurationModel, GroupModel, GroupCollection, Squire) {
'use strict'; 'use strict';
......
cms/static/js/spec/views/container_spec.js
define([ "jquery", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "js/spec_helpers/edit_helpers", define([ "jquery", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "js/spec_helpers/edit_helpers",
"js/views/container", "js/models/xblock_info", "jquery.simulate", "js/views/container", "js/models/xblock_info", "jquery.simulate",
"xmodule", "coffee/src/main", "xblock/cms.runtime.v1"], "xmodule", "js/main", "xblock/cms.runtime.v1"],
function ($, AjaxHelpers, EditHelpers, ContainerView, XBlockInfo) { function ($, AjaxHelpers, EditHelpers, ContainerView, XBlockInfo) {
describe("Container View", function () { describe("Container View", function () {
......
cms/static/js/spec/views/xblock_spec.js
define(["jquery", "URI", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "common/js/components/utils/view_utils", define(["jquery", "URI", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", "common/js/components/utils/view_utils",
"js/views/xblock", "js/models/xblock_info", "xmodule", "coffee/src/main", "xblock/cms.runtime.v1"], "js/views/xblock", "js/models/xblock_info", "xmodule", "js/main", "xblock/cms.runtime.v1"],
function ($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) { function ($, URI, AjaxHelpers, ViewUtils, XBlockView, XBlockInfo) {
"use strict"; "use strict";
describe("XBlockView", function() { describe("XBlockView", function() {
......
cms/static/js/spec_helpers/edit_helpers.js
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
define(["jquery", "underscore", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers", define(["jquery", "underscore", "edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers",
"common/js/spec_helpers/template_helpers", "js/spec_helpers/modal_helpers", "js/views/modals/edit_xblock", "common/js/spec_helpers/template_helpers", "js/spec_helpers/modal_helpers", "js/views/modals/edit_xblock",
"js/collections/component_template", "xmodule", "coffee/src/main", "xblock/cms.runtime.v1"], "js/collections/component_template", "xmodule", "js/main", "xblock/cms.runtime.v1"],
function($, _, AjaxHelpers, TemplateHelpers, modal_helpers, EditXBlockModal, ComponentTemplates) { function($, _, AjaxHelpers, TemplateHelpers, modal_helpers, EditXBlockModal, ComponentTemplates) {
var installMockXBlock, uninstallMockXBlock, installMockXModule, uninstallMockXModule, var installMockXBlock, uninstallMockXBlock, installMockXModule, uninstallMockXModule,
......
common/djangoapps/terrain/ui_helpers.py
...@@ -39,7 +39,7 @@ REQUIREJS_WAIT = { ...@@ -39,7 +39,7 @@ REQUIREJS_WAIT = {
# Unit page # Unit page
re.compile(r'^Unit \|'): [ re.compile(r'^Unit \|'): [
"jquery", "js/base", "js/models/xblock_info", "js/views/pages/container", "jquery", "js/base", "js/models/xblock_info", "js/views/pages/container",
"js/collections/component_template", "xmodule", "coffee/src/main", "xblock/cms.runtime.v1"], "js/collections/component_template", "xmodule", "js/main", "xblock/cms.runtime.v1"],
# Content - Outline # Content - Outline
# Note that calling your org, course number, or display name, 'course' will mess this up # Note that calling your org, course number, or display name, 'course' will mess this up
...@@ -49,18 +49,18 @@ REQUIREJS_WAIT = { ...@@ -49,18 +49,18 @@ REQUIREJS_WAIT = {
# Dashboard # Dashboard
re.compile(r'^Studio Home \|'): [ re.compile(r'^Studio Home \|'): [
"js/sock", "gettext", "js/base", "js/sock", "gettext", "js/base",
"jquery.ui", "coffee/src/main", "underscore"], "jquery.ui", "js/main", "underscore"],
# Upload # Upload
re.compile(r'^\s*Files & Uploads'): [ re.compile(r'^\s*Files & Uploads'): [
'js/base', 'jquery.ui', 'coffee/src/main', 'underscore', 'js/base', 'jquery.ui', 'js/main', 'underscore',
'js/views/assets', 'js/views/asset' 'js/views/assets', 'js/views/asset'
], ],
# Pages # Pages
re.compile(r'^Pages \|'): [ re.compile(r'^Pages \|'): [
'js/models/explicit_url', 'js/views/tabs', 'js/models/explicit_url', 'js/views/tabs',
'xmodule', 'coffee/src/main', 'xblock/cms.runtime.v1' 'xmodule', 'js/main', 'xblock/cms.runtime.v1'
], ],
} }
......
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