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

Fix merge conflicts

Browse Source
This commit is contained in:
Calen Pennington
2014-05-22 11:15:04 -04:00
parent cd862b3253
commit 240fcc1d5a
19 changed files with 24 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/js/spec/views/pages/container_spec.js
View File

@@ -311,7 +311,7 @@ define(["jquery", "underscore", "js/spec_helpers/create_sinon", "js/spec_helpers
// verify content of request
request = lastRequest();
expect(request.url).toEqual("/xblock");
expect(request.url).toEqual("/xblock/");
expect(request.method).toEqual("POST");
expect(JSON.parse(request.requestBody)).toEqual(
JSON.parse(

13
cms/static/js/spec/views/unit_spec.js
View File

@@ -1,15 +1,3 @@
<<<<<<< HEAD
define(["coffee/src/views/unit", "js/models/module_info", "js/spec_helpers/create_sinon", "js/views/feedback_notification",
"jasmine-stealth"],
function (UnitEditView, ModuleModel, create_sinon, NotificationView) {
var verifyJSON = function (requests, json) {
var request = requests[requests.length - 1];
expect(request.url).toEqual("/xblock/");
expect(request.method).toEqual("POST");
// There was a problem with order of returned parameters in strings.
// Changed to compare objects instead strings.
expect(JSON.parse(request.requestBody)).toEqual(JSON.parse(json));
=======
define(["jquery", "underscore", "jasmine", "coffee/src/views/unit", "js/models/module_info",
"js/spec_helpers/create_sinon", "js/spec_helpers/edit_helpers", "jasmine-stealth"],
function ($, _, jasmine, UnitEditView, ModuleModel, create_sinon, edit_helpers) {
@@ -21,7 +9,6 @@ define(["jquery", "underscore", "jasmine", "coffee/src/views/unit", "js/models/m
{ html: html, "resources": [] },
requestIndex
);
>>>>>>> edx/master
};
initialize = function(test) {

2
cms/static/js/spec_helpers/edit_helpers.js
View File

@@ -94,7 +94,7 @@ define(["jquery", "underscore", "js/spec_helpers/create_sinon", "js/spec_helpers
verifyXBlockRequest = function (requests, expectedJson) {
var request = requests[requests.length - 1],
actualJson = JSON.parse(request.requestBody);
expect(request.url).toEqual("/xblock");
expect(request.url).toEqual("/xblock/");
expect(request.method).toEqual("POST");
expect(actualJson).toEqual(expectedJson);
};

10
cms/static/js/utils/module.js
View File

@@ -11,16 +11,11 @@ define(["underscore"], function (_) {
var urlRoot = '/xblock';
var getUpdateUrl = function (locator) {
<<<<<<< HEAD
if (locator === undefined) {
return urlRoot + "/";
=======
if (_.isUndefined(locator)) {
return urlRoot;
>>>>>>> edx/master
return urlRoot + '/';
}
else {
return urlRoot + "/" + locator;
return urlRoot + '/' + locator;
}
};
return {
@@ -28,4 +23,3 @@ define(["underscore"], function (_) {
getUpdateUrl: getUpdateUrl
};
});

4
cms/static/js/views/pages/container.js
View File

@@ -116,7 +116,7 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification",
requestData = _.extend(template, {
parent_locator: parentLocator
});
return $.postJSON(this.getURLRoot(), requestData,
return $.postJSON(this.getURLRoot() + '/', requestData,
_.bind(this.onNewXBlock, this, placeholderElement, scrollOffset));
},
@@ -135,7 +135,7 @@ define(["jquery", "underscore", "gettext", "js/views/feedback_notification",
duplicate_source_locator: xblockElement.data('locator'),
parent_locator: parentElement.data('locator')
};
return $.postJSON(self.getURLRoot(), requestData,
return $.postJSON(self.getURLRoot() + '/', requestData,
_.bind(self.onNewXBlock, self, placeholderElement, scrollOffset));
});
},