Changeset 2567:6c11245cbf04 for themes

Timestamp:

11/17/13 20:30:21 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2564:c8bf313d697e (diff), 2566:9bf417837888 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from 2.6

Files:

• themes/ductile/_prepend.php (modified) (1 diff)
• themes/ductile/_prepend.php (modified) (1 diff)

themes/ductile/_prepend.php

@@ -56 +56 @@
      }
 }
-?>

themes/ductile/_prepend.php

@@ -26 +26 @@
           if (!$core->auth->user_prefs->accessibility->nodragdrop) {
                echo
-                    dcPage::jsLoad('js/jquery/jquery-ui.custom.js');
+                    dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+                    dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js');
                     echo <<<EOT
 <script type="text/javascript">