Changeset 2496:e33dcbc18e36 for plugins/simpleMenu/index.php

Timestamp:

10/27/13 09:52:46 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2495:dc8c7974ff0b (diff), 2494:b168f47c7f9c (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 2.6 commits to the current 2.7-dev

Files:

• plugins/simpleMenu/index.php (modified) (1 diff)
• plugins/simpleMenu/index.php (modified) (1 diff)

plugins/simpleMenu/index.php

@@ -347 +347 @@
                echo
                     dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+                    dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js').
                     dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js');
           }

plugins/simpleMenu/index.php

@@ -350 +350 @@
                     dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js');
           }
+          echo dcPage::jsConfirmClose('additem','menuitems');
      ?>
 </head>