You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2011/10/20 02:13:23 UTC
svn commit: r1186576 - in
/shindig/trunk/features/src/main/javascript/features/actions: actions.js
actions_container.js
Author: rbaxter85
Date: Thu Oct 20 00:13:23 2011
New Revision: 1186576
URL: http://svn.apache.org/viewvc?rev=1186576&view=rev
Log:
SHINDIG-1642
Committed For Chih-hung Chiang
Declarative action does not work on IE
Modified:
shindig/trunk/features/src/main/javascript/features/actions/actions.js
shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
Modified: shindig/trunk/features/src/main/javascript/features/actions/actions.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/actions/actions.js?rev=1186576&r1=1186575&r2=1186576&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/actions/actions.js (original)
+++ shindig/trunk/features/src/main/javascript/features/actions/actions.js Thu Oct 20 00:13:23 2011
@@ -44,8 +44,7 @@ gadgets['actions'] = (function() {
var callback = callbackRegistry.getCallback(actionId);
if (callback) {
- var args = selectionObj ? [selectionObj] : null;
- callback.apply(this, args);
+ callback.apply(this, selectionObj ? [selectionObj] : []);
}
};
Modified: shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/actions/actions_container.js?rev=1186576&r1=1186575&r2=1186576&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/actions/actions_container.js (original)
+++ shindig/trunk/features/src/main/javascript/features/actions/actions_container.js Thu Oct 20 00:13:23 2011
@@ -486,18 +486,17 @@
if (!(actions instanceof Array)) {
actions = [actions];
}
- for (var i in actions) {
+ for (var i=0; i<actions.length; i++) {
var actionObj = actions[i];
+ var actionObj_new = {};
// replace @ for attribute keys;
for (itemAttr in actionObj) {
var attrStr = itemAttr.substring(1);
- var attrVal = actionObj[itemAttr];
- actionObj[attrStr] = attrVal;
- delete actionObj[itemAttr];
+ actionObj_new[attrStr] = actionObj[itemAttr];
}
// check if action already exists
- if (!registry.getItemById(actionObj.id)) {
- addAction(actionObj, url);
+ if (!registry.getItemById(actionObj_new.id)) {
+ addAction(actionObj_new, url);
}
}
}