Changeset 11066

Timestamp:

May 26, 2011, 3:56:13 PM (14 years ago)

Author:

cljosse

Message:

• load jquery.js if is missing

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (4 diffs)
• template/header_2_2.tpl (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -372 +372 @@
          newResize: function () {
            //
-           //if (options.imageAutosize) return true ;stripped
+           if (typeof options != undefined)
+             if (options.imageAutosize)
+               return true; //stripped
            if (DEBUG_autosize == "true") {
              nu_img += 1;
@@ -440 +442 @@
 
                marge = (info_the_page.width - info_HeaderBar.width) / 2;
-               marge_right = marge;
-               marge_left = marge;
+               marge_right = marge + 2;
+               marge_left = marge + 2;
              } else if (info_ToolBar.width > 0) {
                marge = (info_the_page.width - info_ToolBar.width) / 2;
@@ -1036 +1038 @@
              jQuery("#navThumbNext").css({ display: 'none' });
              jQuery("#navThumbPrev").css({ display: 'none' });
-             jQuery("#theImage").css({ marginTop: info_ToolBar.height+"px", marginLeft: "0px",
-               width: winwidth+"px",
+             jQuery("#theImage").css({ marginTop: info_ToolBar.height + "px", marginLeft: "0px",
+               width: winwidth + "px",
                height: winheight + "px"
              });
@@ -1113 +1115 @@
              pos = "absolute";
              info_theImageBox = jQuery("#theImageAndTitle").infos();
+             p1 = jQuery(".randomButtons").infos();
+             p2=jQuery("#imageHeaderBar").infos();
+             jQuery("#theImage").width("width", info_theImageBox.width + "px");
+             jQuery("#theImageAndTitle").css("position", "relative");
+             jQuery("#theImageAndTitle").css({marginTop: "0px",
+               paddingTop: (p1.top) + "px"
+             });
              t1 = info_theImageBox.top;
              l1 = info_theImageBox.left;

extensions/Autosize/template/header_2_2.tpl

@@ -3 +3 @@
  <script  id="pamoorama0.3" src="plugins/paMOOramics/js/pamoorama0.3.js" type="text/jscript"></script>
 <script id="mootools" src="plugins/paMOOramics/js/mootools.js" type="text/jscript"></script>
-
-
-{else}{/if}{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js"
-require="jquery" }
+{else}
+{/if}
+{* au ou jquery non défini  *}
+{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
+{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
 {combine_script id="conflit_script"  path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery" }
 {combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
-{combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"}
-{combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery"}
+{combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery,conflit_script0"}
+{combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery,conflit_script0"}