0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merging changes

Browse source
This commit is contained in:
rolux 2010-07-05 19:01:42 +02:00
parent 4363c8dac1
commit b42ba9534e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/js/ox.ui.js
View file

@ -4271,13 +4271,18 @@ requires
); );
function parseKeyboard(str) { function parseKeyboard(str) {
<<<<<<< TREE
Ox.print("str", str, options)
if (Ox.isObject(str)) return str; // fixme: this should not happen if (Ox.isObject(str)) return str; // fixme: this should not happen
=======
if (Ox.isObject(str)) return str; // fixme: this should not happen
>>>>>>> MERGE-SOURCE
var modifiers = str.split(" "), var modifiers = str.split(" "),
key = modifiers.pop(); key = modifiers.pop();
return { return {
modifiers: modifiers, modifiers: modifiers,
key: key key: key
} };
} }
self.onChange = function(key, value) { self.onChange = function(key, value) {