Changeset 1771:8764fa2fdf5d for inc

Timestamp:

09/10/13 10:54:36 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Children:

1773:1f2fd319f35e, 1774:147afd09394c

Message:

Upgrade jQuery to 1.10.2 using jQuery migrate plugin (1.2.1)
Add a setting to mute/show warnings generated by jQuery migrate plugin.

Todo: add that setting in install and update process.

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (2 diffs)
• prepend.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -474 +474 @@
      public static function jsCommon()
      {
+          $mute_or_no = '';
+          if ($GLOBALS['core']->blog->settings->system->jquery_migrate_mute) {
+               $mute_or_no .=
+                    '<script type="text/javascript">'."\n".
+                    "//<![CDATA[\n".
+                    'jQuery.migrateMute = true;'.
+                    "\n//]]>\n".
+                    "</script>\n";
+          }
+
           return
           self::jsLoad('js/jquery/jquery.js').
+          $mute_or_no.
+          self::jsLoad('js/jquery/jquery-migrate-1.2.1.js').
           self::jsLoad('js/jquery/jquery.biscuit.js').
           self::jsLoad('js/jquery/jquery.bgFade.js').
@@ -484 +496 @@
           "//<![CDATA[\n".
           self::jsVar('dotclear.nonce',$GLOBALS['core']->getNonce()).
-
           self::jsVar('dotclear.img_plus_src','images/expand.png').
           self::jsVar('dotclear.img_plus_alt',__('uncover')).

inc/admin/prepend.php

@@ -374 +374 @@
           }
      }
+     
+     if (empty($core->blog->settings->system->jquery_migrate_mute)) {
+          $core->blog->settings->system->put('jquery_migrate_mute', true, 'boolean', 'Mute warnings for jquery migrate plugin ?', false);
+     }
 }
 ?>