From fcaef1ee58f0356eedfb297292089bba0fa9257a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= Date: Sat, 23 Apr 2011 09:07:31 +0000 Subject: [PATCH] resolved issues with for-in loop and ie --- phpgwapi/js/egw_action/egw_action.js | 4 ++-- phpgwapi/js/egw_action/egw_action_common.js | 4 ++-- phpgwapi/js/egw_action/egw_action_dragdrop.js | 8 ++++---- phpgwapi/js/egw_action/egw_action_popup.js | 6 +++--- phpgwapi/js/egw_action/egw_grid.js | 2 +- phpgwapi/js/egw_action/egw_grid_columns.js | 2 +- phpgwapi/js/egw_action/egw_menu.js | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/phpgwapi/js/egw_action/egw_action.js b/phpgwapi/js/egw_action/egw_action.js index 9dee68c1ba..7087c18952 100644 --- a/phpgwapi/js/egw_action/egw_action.js +++ b/phpgwapi/js/egw_action/egw_action.js @@ -1236,7 +1236,7 @@ egwActionObject.prototype.registerActions = function() { var groups = this.getActionImplementationGroups(); - for (group in groups) + for (var group in groups) { // Get the action implementation for each group if (typeof _egwActionClasses[group] != "undefined" && @@ -1405,7 +1405,7 @@ egwActionObject.prototype._getLinks = function(_objs, _actionType) } // Check whether all objects supported the action - for (k in actionLinks) + for (var k in actionLinks) { actionLinks[k].enabled = actionLinks[k].enabled && (actionLinks[k].cnt >= testedSelected.length) && diff --git a/phpgwapi/js/egw_action/egw_action_common.js b/phpgwapi/js/egw_action/egw_action_common.js index 6f821a2ed9..9229ab13ab 100644 --- a/phpgwapi/js/egw_action/egw_action_common.js +++ b/phpgwapi/js/egw_action/egw_action_common.js @@ -20,7 +20,7 @@ */ function egwActionStoreJSON(_data, _obj, _setterOnly) { - for (key in _data) + for (var key in _data) { if (key.charAt(0) != '_') { @@ -64,7 +64,7 @@ function egwBitIsSet(_set, _bit) function egwObjectLength(_obj) { var len = 0; - for (k in _obj) len++; + for (var k in _obj) len++; return len; } diff --git a/phpgwapi/js/egw_action/egw_action_dragdrop.js b/phpgwapi/js/egw_action/egw_action_dragdrop.js index 52c839d4d2..0883be39f5 100644 --- a/phpgwapi/js/egw_action/egw_action_dragdrop.js +++ b/phpgwapi/js/egw_action/egw_action_dragdrop.js @@ -153,7 +153,7 @@ function egwDragActionImplementation() this.selected = _selected; // Call the onExecute event of the first actionObject - for (k in _links) + for (var k in _links) { if (_links[k].visible) { @@ -297,7 +297,7 @@ function egwDropActionImplementation() // Disable all links which only accept types which are not // inside ddTypes - for (k in links) + for (var k in links) { var accepted = links[k].actionObj.acceptedTypes; @@ -317,7 +317,7 @@ function egwDropActionImplementation() // Check whether there is only one link var cnt = 0; var lnk = null; - for (k in links) + for (var k in links) { if (links[k].enabled && links[k].visible) { @@ -373,7 +373,7 @@ function egwDropActionImplementation() { // Accumulate the accepted types var accepted = []; - for (k in _links) + for (var k in _links) { for (var i = 0; i < _links[k].actionObj.acceptedTypes.length; i++) { diff --git a/phpgwapi/js/egw_action/egw_action_popup.js b/phpgwapi/js/egw_action/egw_action_popup.js index bf91b6dbb3..1a8b232dfd 100644 --- a/phpgwapi/js/egw_action/egw_action_popup.js +++ b/phpgwapi/js/egw_action/egw_action_popup.js @@ -173,7 +173,7 @@ function egwPopupActionImplementation() else { var defaultAction = null; - for (k in _links) + for (var k in _links) { if (_links[k].actionObj["default"] && _links[k].enabled) { @@ -258,7 +258,7 @@ function egwPopupActionImplementation() // Transform the link_groups object into an sorted array var groups = []; - for (k in link_groups) + for (var k in link_groups) { groups.push({"grp": k, "links": link_groups[k]}); } @@ -361,7 +361,7 @@ function egwPopupActionImplementation() // Build a tree containing all actions var tree = {"root": []}; - for (k in _links) + for (var k in _links) { _links[k].actionObj.appendToTree(tree); } diff --git a/phpgwapi/js/egw_action/egw_grid.js b/phpgwapi/js/egw_action/egw_grid.js index 40079c6a9b..396c73d876 100644 --- a/phpgwapi/js/egw_action/egw_grid.js +++ b/phpgwapi/js/egw_action/egw_grid.js @@ -165,7 +165,7 @@ egwGrid.prototype.selectcolsClick = function(_at) { // Create the user data column visibility set var set = {}; - for (k in column_data) + for (var k in column_data) { set[k] = { "visible": column_data[k].visible diff --git a/phpgwapi/js/egw_action/egw_grid_columns.js b/phpgwapi/js/egw_action/egw_grid_columns.js index ae16f97e23..56ced80b0b 100644 --- a/phpgwapi/js/egw_action/egw_grid_columns.js +++ b/phpgwapi/js/egw_action/egw_grid_columns.js @@ -534,7 +534,7 @@ egwGridColumns.prototype.setColumnVisibilitySet = function(_set) { this._beginUpdate(); - for (k in _set) + for (var k in _set) { var col = this.getColumnById(k); if (col) diff --git a/phpgwapi/js/egw_action/egw_menu.js b/phpgwapi/js/egw_action/egw_menu.js index 257dce4a47..52f6ac749d 100644 --- a/phpgwapi/js/egw_action/egw_menu.js +++ b/phpgwapi/js/egw_action/egw_menu.js @@ -55,7 +55,7 @@ function _egwGenMenuStructure(_elements, _parent) //Go through each key of the current object var obj = _elements[i]; var item = new egwMenuItem(_parent, null); - for (key in obj) + for (var key in obj) { if (key == "children" && obj[key].constructor === Array) {