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

Move getSession() call out of render method to avoid crash on Chrome.

Browse Source
This commit is contained in:
cahrens
2013-02-08 08:26:24 -05:00
parent 287715c6ff
commit 950f5de3ca
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/js/template_loader.js
View File

@@ -5,7 +5,7 @@
if (typeof window.templateLoader == 'function') return;
var templateLoader = {
templateVersion: "0.0.13",
templateVersion: "0.0.14",
templates: {},
loadRemoteTemplate: function(templateName, filename, callback) {
if (!this.templates[templateName]) {

41
cms/static/js/views/settings/advanced_view.js
View File

@@ -11,8 +11,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
'click .cancel-button' : "revertView",
'click .new-button' : "addEntry",
// update model on changes
'change #course-advanced-policy-key' : "updateKey",
'change #course-advanced-policy-value' : "updateValue"
'change #course-advanced-policy-key' : "updateKey"
// TODO enable/disable save (add disabled class) based on validation & dirty
// TODO enable/disable new button?
},
@@ -27,6 +26,11 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
}
);
this.model.on('error', this.handleValidationError, this);
this.render = _.wrap(this.render, function(render) {
render();
self.afterRender();
return self;
});
},
render: function() {
// catch potential outside call before template loaded
@@ -46,17 +50,32 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
self.fieldToSelectorMap[key] = key;
});
// Swap in ACE Editor for all the value (JSON) fields.
return this;
},
afterRender: function () {
var listEle$ = this.$el.find('.course-advanced-policy-list');
var policyValueDivs = listEle$.find('.ace');
_.each(policyValueDivs,
function (div) {
var editor = ace.edit(div);
editor.setTheme("ace/theme/chrome");
editor.getSession().setMode("ace/mode/json");
editor.setHighlightActiveLine(false);
editor.setTheme("ace/theme/chrome");
editor.setHighlightActiveLine(false);
editor.on("blur",
function (e) {
var key = $(editor.container).closest('.row').children('.key').attr('id');
// TODO: error checking in case it does not parse!
var quotedValue = editor.getValue();
var JSONValue = JSON.parse(quotedValue);
self.model.set(key, JSONValue, {validate:true});
});
// Calling getSession() directly in render causes a crash on Chrome.
// Seems to be OK in afterRender method.
editor.getSession().setMode("ace/mode/json");
});
return this;
},
deleteEntry : function(event) {
event.preventDefault();
// find out which entry
@@ -178,13 +197,5 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
return false;
}
else return true;
},
updateValue : function(event) {
// much simpler than key munging. just update the value
var key = $(event.currentTarget).closest('.row').children('.key').attr('id');
var value = $(event.currentTarget).val();
console.log('updating ', key, value);
this.model.set(key, value, {validate:true});
}
});