jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix theme==undefined in cloud9 splitview

Browse source
This commit is contained in:
nightwing 2013-03-24 12:24:40 +04:00
commit 9cc74437c2
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/ace/config.js
View file

@ -93,22 +93,37 @@ exports.setModuleUrl = function(name, subst) {
return options.$moduleUrls[name] = subst;
};
exports.$loading = {};
exports.loadModule = function(moduleName, onLoad) {
var module, moduleType;
if (Array.isArray(moduleName)) {
moduleType = moduleName[0];
moduleName = moduleName[1];
}
try {
module = require(moduleName);
} catch (e) {};
if (module)
// require(moduleName) can return empty object if called after require([moduleName], callback)
if (module && !exports.$loading[moduleName])
return onLoad && onLoad(module);
if (!exports.$loading[moduleName])
exports.$loading[moduleName] = [];
exports.$loading[moduleName].push(onLoad);
if (exports.$loading[moduleName].length > 1)
return;
var afterLoad = function() {
require([moduleName], function(module) {
exports._emit("load.module", {name: moduleName, module: module});
onLoad && onLoad(module);
var listeners = exports.$loading[moduleName];
exports.$loading[moduleName] = null;
listeners.forEach(function(onLoad) {
onLoad && onLoad(module);
});
});
};

6
lib/ace/virtual_renderer.js
View file

@ -496,7 +496,7 @@ var VirtualRenderer = function(container, theme) {
var style = this.$printMarginEl.style;
style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px";
style.visibility = this.$showPrintMargin ? "visible" : "hidden";
if (this.session && this.session.$wrap == -1)
this.adjustWrapLimit();
};
@ -1268,6 +1268,8 @@ var VirtualRenderer = function(container, theme) {
}
function afterLoad(theme) {
if (!theme.cssClass)
return;
dom.importCssString(
theme.cssText,
theme.cssClass,
@ -1367,7 +1369,7 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
this.$updatePrintMargin();
},
get: function() {
return this.$showPrintMargin && this.$printMarginColumn;
return this.$showPrintMargin && this.$printMarginColumn;
}
},
showGutter: {