Changeset 2145

Timestamp:

09/08/10 10:30:22 (17 months ago)

Author:

tboutell

Message:

Firefox and Chrome respond differently to nested JS functions. In Firefox the declaration of the function must be executed before the call to the function, in Chrome you don't have to do that. I refactored the nested function to be a private method of the Apostrophe object, which felt right and avoided the confusion of dealing with nested functions. (I could also have defined it inside the method that calls it, but before the first call to it.)

Files:

• plugins/apostrophePlugin/trunk/web/js/a.js (modified) (2 diffs)

plugins/apostrophePlugin/trunk/web/js/a.js

@@ -497 +497 @@
                         // a loop variable does *not* get captured
                         // in the closure at its current value otherwise
-                        setButtons(slot, n, slots);
-                        function setButtons(slot, n, slots)
-                        {
-                                if (n > 0)
-                                {
-                                        // TODO: this is not sensitive enough to nested areas
-                                        $(slot).find('.a-arrow-up').show().unbind('click').click(function() {
-                                                // It would be nice to confirm success here in some way
-                                                $.get(updateAction, { id: id, name: name, permid: $(slot).data('a-permid'), up: 1 });
-                                                apostrophe.swapNodes(slot, slots[n - 1]);
-                                                apostrophe.areaUpdateMoveButtons(updateAction, id, name);
-                                                return false;
-                                        });
-                                }
-                                else
-                                {
-                                  $(slot).find('.a-arrow-up').hide();
-                                }
-                                if (n < (slots.length - 1))
-                                {
-                                        $(slot).find('.a-arrow-down').show().unbind('click').click(function() {
-                                                // It would be nice to confirm success here in some way
-                                                $.get(updateAction, { id: id, name: name, permid: $(slot).data('a-permid'), up: 0 });
-                                                apostrophe.swapNodes(slot, slots[n + 1]);
-                                                apostrophe.areaUpdateMoveButtons(updateAction, id, name);
-                                                return false;
-                                        });
-                                }
-                                else
-                                {
-                                        $(slot).find('.a-arrow-down').hide();
-                                }
-                        }
+                        slotUpdateMoveButtons(id, name, slot, n, slots, updateAction);
                 }
         }
@@ -537 +505 @@
                 $("#a-slot-" + pageid + "-" + name + "-" + permid).removeClass('a-new-slot');
         }
+        
+        // Private methods callable only from the above (no this.foo = bar)
+        function slotUpdateMoveButtons(id, name, slot, n, slots, updateAction)
+        {
+                if (n > 0)
+                {
+                        // TODO: this is not sensitive enough to nested areas
+                        $(slot).find('.a-arrow-up').show().unbind('click').click(function() {
+                                // It would be nice to confirm success here in some way
+                                $.get(updateAction, { id: id, name: name, permid: $(slot).data('a-permid'), up: 1 });
+                                apostrophe.swapNodes(slot, slots[n - 1]);
+                                apostrophe.areaUpdateMoveButtons(updateAction, id, name);
+                                return false;
+                        });
+                }
+                else
+                {
+                  $(slot).find('.a-arrow-up').hide();
+                }
+                if (n < (slots.length - 1))
+                {
+                        $(slot).find('.a-arrow-down').show().unbind('click').click(function() {
+                                // It would be nice to confirm success here in some way
+                                $.get(updateAction, { id: id, name: name, permid: $(slot).data('a-permid'), up: 0 });
+                                apostrophe.swapNodes(slot, slots[n + 1]);
+                                apostrophe.areaUpdateMoveButtons(updateAction, id, name);
+                                return false;
+                        });
+                }
+                else
+                {
+                        $(slot).find('.a-arrow-down').hide();
+                }
+        }
 }