Changeset 7740 for extensions/Autosize/js

Timestamp:

Nov 11, 2010, 10:29:02 AM (14 years ago)

Author:

cljosse

Message:

[Autosize][beta] save

Location:

extensions/Autosize/js

Files:

• Affiche_script.js (modified) (9 diffs)
• conflit.js (modified) (8 diffs)

extensions/Autosize/js/Affiche_script.js

@@ -26 +26 @@
 
 jQuery(document).ready(
-
      function (jQuery) {
-
-
-
          jQuery(window).load(function () {
-             jQuery("#theImage").css({
-                 opacity: '0.0'
-             });
+
              //======= cl_conflit ======
              if (DEBUG == "false") {
@@ -244 +238 @@
                      Bandeau_bas = info_description;
 
-                     jQuery("#Debug").css({
+                     jQuery("#Debug").css({ opacity: 0.5,
                          filter: 'alpha(opacity:50)',
                          position: "absolute",
@@ -253 +247 @@
                      jQuery("#Debug").text("Debug:Bandeau : " + Bandeau);
 
-                     jQuery("#Debug1").css({
+                     jQuery("#Debug1").css({ opacity: 0.5,
                          filter: 'alpha(opacity:50)',
                          position: "absolute",
@@ -263 +257 @@
                      jQuery("#Debug1").text("Debug1:Bandeau_bas top : " + Bandeau_bas.top + " height:" + Bandeau_bas.height);
 
-                     jQuery("#Debug2").css({
+                     jQuery("#Debug2").css({ opacity: 0.5,
                          filter: 'alpha(opacity:50)',
                          position: "absolute",
@@ -452 +446 @@
                      var info_pamoorama_inner = jQuery("#pamoorama_inner").infos();
                      var info_pamoorama_footer = jQuery("#pamoorama_footer").infos();
+                     var info_pamoorama_frame = jQuery("#pamoorama_frame").infos();
                      TheImg = jQuery("#pamoorama");
+                      
+                  var myPamoorama = this.myPamoorama;
+                   //  myPamoorama = pamoorama;
 
                      /*
@@ -584 +582 @@
                          if (typeof (myPamoorama.skipInit) == "undefined") return false;
                          if (myPamoorama.skipInit == false) {
-                            // setTimeout("wait_Timer()",300); 
+                             // setTimeout("wait_Timer()",300); 
                              return false;
                          }
@@ -948 +946 @@
                      jQuery("#pamoorama_footer").css('width', new_width + "px");
                      //====================================================
-
-                    //myPamoorama.continueInit();
+                     var info_pamoorama = jQuery("#pamoorama").infos();
+                     var info_pamoorama_outter = jQuery("#pamoorama_outter").infos();
+                     var info_pamoorama_inner = jQuery("#pamoorama_inner").infos();
+                     var info_pamoorama_footer = jQuery("#pamoorama_footer").infos();
+                     var info_pamoorama_frame = jQuery("#pamoorama_frame").infos();
+
+                     //myPamoorama.dragHandle.options.limit.x = { 0: 0, 1: 400 }
+                     /*   myPamoorama.frame.makeDraggable({
+                     modifiers: { x: 'left', y: false },
+                     limit: { x: [0, 200 - myPamoorama.frame.getStyle('width').toInt()] }
+                     });
+                     */
+                     //myPamoorama.continueInit();
                      //myPamoorama.skipInit = false;
+                     //pamoorama_thumb
+                     //               img
+                     info_frame = jQuery(myPamoorama.frame).infos();
+                     myPamoorama.ratio = new_width / 200;
+                     jQuery("#pamoorama_frame").width(myPamoorama.ratio);
+                     jQuery("#pamoorama_frame").css("width", myPamoorama.ratio + "px");
+
 
                      jQuery("#linkNext").css({ width: "200px", overflow: "hidden" });
@@ -1061 +1077 @@
              var pos;
              var set_p = false;
+
              fade_in = parseInt(fade_in);
-
-             jQuery("#theImage").animate(
+             jQuery("#theImage").css({ opacity: 0,
+                 filter: 'alpha(opacity: 0)'
+
+             });
+             resize_ok = Resize();
+
+            if (!resize_ok )
+           jQuery("#theImage").animate(
                 { opacity: 0 }
              , 500, "swing", function () {
-                 if (Resize() == true) return;
-                 jQuery("#theImage").animate(
-                { opacity: 0.0 }
-             , fade_in, "swing", function () {
-                 if (Resize()) return
-                 opacite = set_opacite(1);
-                 jQuery("#theImage").animate(
-                opacite
-             , fade_in, "swing", function () {
-                 Resize();
+                 resize_ok = Resize();
+                 if (!resize_ok)
+                    jQuery("#theImage").animate(
+                        { opacity: 0 }
+                        , 1000, "swing", function () {
+                            resize_ok = Resize();
+                            if (resize_ok)
+                                jQuery("#theImage").animate(
+                                { opacity: 1 }
+                                , 1000, "swing", function () {
+                                    resize_ok = Resize();
+                                    });
+                                });
+
              });
-             });
-             });
+              
+             resize_ok = Resize();
 
 
@@ -1128 +1155 @@
 
      } // function
-);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             // ready
+);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   // ready
     /*
 *

extensions/Autosize/js/conflit.js

@@ -8 +8 @@
 var d1 = 0;
 var init_tb = 0;
+//$ = jQuery.noConflict();
+
 //===================================================
 function $(element, nc) {
+
         return conflit(element, nc)
     }
-
 
 //===================================================
@@ -36 +38 @@
     return ret_element;
 
-if (DEBUG=="true")
-    alert(retour);
-                       return jQuery(element);
+if (typeof (element) == "string") {
+    if (element.match("^#|.ui", "gi")) {
+        ret_element = jQuery(element);
+        return ret_element;
+    }
+} else if (typeof (element) == "function") {
+    fn = element.toString();
+    if (fn.match("#pwg", "gi")) {
+        ret_element = jQuery(element);
+        return ret_element;
+    }
+} else if ( element==document) {
+ 
+        ret_element = jQuery(element);
+        return ret_element;
+   
+     
+    }
+tp0 = typeof (element);
+
+ ret_element = jQuery(element);
+if (DEBUG == "true") {
+     retour = (getStackTrace());
+     alert("element : " + element + " retour : " + retour);
+    
+}
+ return  ret_element ;
 }
 
@@ -48 +74 @@
                 return conflit(element, nc);
             }
-
-            if (theme.match("gally", "gi"))
-                if (isFunction(inittoolbar)) {
-                    if (typeof (currentTab) == "undefined") inittoolbar();
-                    else initializeImageMode("resize");
-                };
+            p0 = jQuery("#theImage");
+            if (p0.length) {
+                if (theme.match("gally", "gi"))
+                    if (isFunction(inittoolbar)) {
+                        if (typeof (currentTab) == "undefined") inittoolbar();
+                        else initializeImageMode("resize");
+                    };
 
                 p1 = jQuery("#theImage").css("position");
@@ -59 +86 @@
                     //==== compatibilité Gally/LLGBO ===
                     //--- passage relative ==> static ===/
-                    jQuery("#theImage").css( {position:"static",
-                         opacity: '0', filter: 'alpha(opacity= 0)'
-                     }
+                    jQuery("#theImage").css({ position: "static",
+                        opacity: '0', filter: 'alpha(opacity= 0)'
+                    }
 
                    );
                     jQuery("#imageToolBar").css({ position: "relative", top: "0px" });
                 }
-
-            jQuery(window).resize();
+            }
+            //   jQuery(window).resize();
 
         });
@@ -80 +107 @@
 //=========================================================
 (function ($2) {
+ajax: function () {return jQuery.ajax;
+}
+return jQuery;
 $2.fn.panorama2 =
 function (height, width) {               
@@ -91 +121 @@
 
 jQuery.fn.extend({
+     
     //---------------- luciano -------------------------------
     $Luciano: function (el, nc) {
@@ -246 +277 @@
         return ("");
     }
-
+    var fn1 = currentFunction.toString();
     currentFunction = currentFunction.caller;
     //$family
@@ -268 +299 @@
                 }
                 //======================
-                if (fn.match(RegExp("_footer|ie_ready|makeDraggable", "gi"))) {
+                if (fn.match(RegExp("_footer|ie_ready|makeDraggable|droppables", "gi"))) {
                     callstack = [];
                     callstack.push('paMOOramics');