diff --git a/source/Ox.UI/js/Core/Ox.App.js b/source/Ox.UI/js/Core/Ox.App.js index 2573a025..ef0e18ed 100644 --- a/source/Ox.UI/js/Core/Ox.App.js +++ b/source/Ox.UI/js/Core/Ox.App.js @@ -53,7 +53,6 @@ Ox.App = function(options) { options get or set options @*/ that.api.api(function(result) { - Ox.print('RESULT', result) Ox.forEach(result.data.actions, function(val, key) { that.api[key] = function(/*data, age, callback*/) { var data = {}, age = -1, callback = null; diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js index 030596c4..3efd6658 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -846,14 +846,14 @@ Ox.List = function(options, self) { clickable, editable; //alert('singleclick') if (pos > -1) { - if (!e.metaKey && !e.shiftKey && isSelected(pos)) { + if (!data.metaKey && !data.shiftKey && isSelected(pos)) { //alert('??') if (self.selected.length > 1) { // click on one of multiple selected items //alert('!!') select(pos); } else if (self.options.type == 'text' && self.hadFocus) { - $cell = findCell(e); + $cell = findCell(data); if ($cell) { clickable = $cell.is('.OxClickable'); editable = $cell.is('.OxEditable') && !$cell.is('.OxEdit'); diff --git a/source/Ox.js b/source/Ox.js index c3c39eaa..02731320 100644 --- a/source/Ox.js +++ b/source/Ox.js @@ -4254,12 +4254,14 @@ Ox.unserialize Parses query parameters into an object Ox.unserialize = function(str, toNumber) { var obj = {}; Ox.forEach(str.split('&'), function(val) { - var arr = val.split('='); - obj[arr[0]] = !toNumber ? arr[1] - : arr[1].indexOf(',') == -1 ? +arr[1] - : arr[1].split(',').map(function(val) { - return +val; - }); + if (val) { + var arr = val.split('='); + obj[arr[0]] = !toNumber ? arr[1] + : arr[1].indexOf(',') == -1 ? +arr[1] + : arr[1].split(',').map(function(val) { + return +val; + }); + } }); return obj; };