Changeset 322 for trunk/web-app

Timestamp:

Feb 8, 2010, 2:51:23 AM (15 years ago)

Author:

gav

Message:

Move JavascriptService to JsUtilService.
Consolidate similar JsUtilService methods.
Create JsUtilTagLib?.
Disable pulsing of asset tree loading image.

Location:

trunk/web-app/js

Files:

• assetTree.js (modified) (2 diffs)
• jsUtil.js (moved) (moved from trunk/web-app/js/util.js) (1 diff)

trunk/web-app/js/assetTree.js

@@ -4 +4 @@
     Effect.Appear(paneDivId,{duration:0.4});
 
-    // Pulsing loadingImg blocks the default grails animated gif till complete.
-    // After which the default will show as normal.
-    new Effect.Pulsate($(loadingImg), { pulses: 200, duration: 133 });
+    // Disabled since pulsing effect blocks other javascript till complete.
+    // The effect may be stopped with e.cancel() but we will use the default Grails spinner for now.
+    // def e = new Effect.Pulsate($(loadingImg), { pulses: 200, duration: 133 });
 
-    // The updater is only called once per page refresh.
     new Ajax.Updater({ success: paneDivId }, url, {asynchronous:true,evalScripts:true});
 }
@@ -34 +33 @@
     new Ajax.Request(saveUrl, {parameters: params, asynchronous: false});
 }
-
-function toggleBranch(divId, imageId, openImgUrl, closedImgUrl) {
-
-    $(divId).toggle();
-
-    if( $(divId).visible() ) {
-        $(imageId).src= openImgUrl;
-    }
-    else {
-        $(imageId).src= closedImgUrl;
-    }
-
-}

trunk/web-app/js/jsUtil.js

@@ -2 +2 @@
 function toggleUtil(id) {
     $(id).toggle();
+}
+
+function toggleWithImgUtil(id, imageId, openImgUrl, closedImgUrl) {
+
+    $(id).toggle();
+
+    if( $(id).visible() ) {
+        $(imageId).src= openImgUrl;
+    }
+    else {
+        $(imageId).src= closedImgUrl;
+    }
 }