CAMP/oxjstmp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merging changes

Browse Source
This commit is contained in:
rolux 2010-07-05 19:05:31 +02:00
parent 8689630e50
commit dcd80f7268
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/js/ox.ui.js
View File

@ -4271,12 +4271,7 @@ 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 {