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

fix __defineGetter__ errors on ie

Browse source
This commit is contained in:
nightwing 2013-10-05 14:00:15 +04:00
commit aa76fffaf2
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
demo/kitchen-sink/demo.js
View file

@ -617,11 +617,29 @@ env.editor.setOptions({
});
// allow easy access to ace in console, but not in ace code which uses strict
function isNonStrict() {
try { return !!arguments.callee.caller.caller }
catch(e){ return false }
void function() {
function isStrict() {
try { return !arguments.callee.caller.caller.caller}
catch(e){ return true }
}
window.__defineGetter__("ace", function(){ return isNonStrict() && env.editor });
window.__defineGetter__("editor", function(){ return isNonStrict() && env.editor });
window.__defineGetter__("session", function(){ return isNonStrict() && env.editor.session });
window.__defineGetter__("split", function(){ return isNonStrict() && env.split });
function warn() {
if (isStrict()) {
console.error("trying to access to global variable");
}
}
function def(o, key, get) {
Object.defineProperty(o, key, {
configurable: true,
get: get,
set: function(val) {
delete o[key];
o[key] = val;
}
});
}
def(window, "ace", function(){ warn(); return env.editor });
def(window, "editor", function(){ warn(); return env.editor });
def(window, "session", function(){ warn(); return env.editor.session });
def(window, "split", function(){ warn(); return env.split });
}();

2
lib/ace/keyboard/hash_handler.js
View file

@ -57,7 +57,7 @@ function HashHandler(config, platform) {
return this.commandKeyBinding = val;
});
} else {
this.commmandKeyBinding = commandKeyBinding;
this.commmandKeyBinding = this.commandKeyBinding;
}
this.addCommands(config);