Changeset 2837

Timestamp:

07/09/08 09:13:37 (4 months ago)

Author:

juliens

Message:

Merge avec le trunk

Files:

• branches/Copix_3_0_X/www/js/mootools/plugins/loader.js (modified) (4 diffs)
• branches/Copix_3_0_X/www/js/taglib/copixzone.js (modified) (3 diffs)

branches/Copix_3_0_X/www/js/mootools/plugins/loader.js

@@ -1 @@
-var l
+CopixL
-    div:null,
-    cancel:null,
@@ -8 +8 @@
-            this.onCancel = params['onCancel']; 
-        }
+        
-        this.div = new Element('div');
-        this.div.setStyles({
@@ -19 +20 @@
-                           ,'position':'absolute'
-                           ,'text-align':'center'
-'+Copix.getResourceURL('img/tools/load.gif')+'
+themes/default/img/tools/load.gif
-                           ,'background-repeat':'no-repeat'
-                           ,'background-position':'center'
@@ -53 +54 @@
-        }.bind(this))
-    },
-    
-    load: function () {
-        this.div.setStyles({

branches/Copix_3_0_X/www/js/taglib/copixzone.js

@@ -12 +12 @@
-
-        if(options.instanceId) {
-
+
+
+
+
-                if (zone.innerHTML == '') {
-                    Copix.setLoadingHTML(zone);
@@ -19 +22 @@
-                        update: zone,
-                        evalScripts : true,
-{'instanceId': options.instanceId}
+$merge ({'instanceId': options.instanceId}, params)
-                        onComplete: zone.fireEvent.bind(zone,'complete')
-                    }).request();
@@ -29 +32 @@
-            zone.addEvent('load', zone.fireEvent.bind(zone,'complete'));
-        }
+        
+        zone.addEvent('refresh', function (params) {
+            zone.innerHTML = ''
+            zone.fireEvent('load', params);
+        });
-        
-        zone.addEvent('display', function() {