Commit d09e9314 by David Baumgold

Merge pull request #1980 from edx/backbone-1.0.0

Upgrade to Backbone 1.0.0
parents ca1aeb5b 7f69e45b
...@@ -25,7 +25,7 @@ CMS.Models.Location = Backbone.Model.extend({ ...@@ -25,7 +25,7 @@ CMS.Models.Location = Backbone.Model.extend({
course: payload[2], course: payload[2],
category: payload[3], category: payload[3],
name: payload[4] name: payload[4]
} };
} }
else if (_.isString(payload)) { else if (_.isString(payload)) {
this._tagPattern.lastIndex = 0; // odd regex behavior requires this to be reset sometimes this._tagPattern.lastIndex = 0; // odd regex behavior requires this to be reset sometimes
......
...@@ -6,5 +6,5 @@ CMS.Models.ModuleInfo = Backbone.Model.extend({ ...@@ -6,5 +6,5 @@ CMS.Models.ModuleInfo = Backbone.Model.extend({
"data": null, "data": null,
"metadata" : null, "metadata" : null,
"children" : null "children" : null
}, }
}); });
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