Update jquery calls

Only need one set of jquery files.
Making sure to use the same jquery version that Derek had used for the
template in the first place.

diff --git a/Toolkit/Page.php b/Toolkit/Page.php
index 6a58a5b..3bdd095 100755 (executable)
--- a/Toolkit/Page.php
+++ b/Toolkit/Page.php
@@ -147,7 +147,7 @@ class Toolkit_Page
         $GLOBALS['styleSheets'] = array();
         // Resources needed for every page.
         $GLOBALS['topScripts'][] = JQUERY_CDN_JS;
-        $GLOBALS['topScripts'][] = JQUERY_CDN_MIGRATE_JS;
+//        $GLOBALS['topScripts'][] = JQUERY_CDN_MIGRATE_JS;
     }
 
     private function _video()

diff --git a/setup.phtml b/setup.phtml
index d7bd005..9266cda 100644 (file)
--- a/setup.phtml
+++ b/setup.phtml
@@ -522,14 +522,8 @@ define('COUPON_SITE_URL', $serverConfig->coupon_site_url);
 $jqueryUrl = ($isSecurePage) ? 'https://' : 'http://';
 define('JQUERY_CDN_JS', '//code.jquery.com/jquery-1.11.0.min.js');
 define('JQUERY_CDN_MIGRATE_JS', '//code.jquery.com/jquery-migrate-1.2.1.js');
-define(
-    'JQUERY_UI_CDN_CSS',
-    $jqueryUrl . 'code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css'
-);
-define(
-    'JQUERY_UI_CDN_JS',
-    $jqueryUrl . 'code.jquery.com/ui/1.10.4/jquery-ui.min.js'
-);
+define('JQUERY_UI_CDN_CSS', '//code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css');
+define('JQUERY_UI_CDN_JS', '//code.jquery.com/ui/1.11.1/jquery-ui.min.js');
 /**
  * Link URL to access mobile site home page
  */

diff --git a/templates/template.html b/templates/template.html
index e5fc88b..ef7b456 100644 (file)
--- a/templates/template.html
+++ b/templates/template.html
@@ -19,7 +19,6 @@
     <link rel="stylesheet" href="{mediaBaseURL:h}css/foundation.min.css" />
     <link rel="stylesheet" href="{mediaBaseURL:h}css/normalize.css" />
     <link rel="stylesheet" href="{mediaBaseURL:h}styles.css" />
-    <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/themes/smoothness/jquery-ui.css" />
     <script src="{mediaBaseURL:h}js/vendor/modernizr.js"></script>
     {topScripts:h}
   </head>
@@ -231,8 +230,6 @@
       </div> <!-- /inner-wrap -->
     </div> <!-- /off-canva-wrap -->
     {bottomScripts:h}
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js"></script>
     <script src="{mediaBaseURL:h}js/foundation.min.js"></script>
     <script>
       $(document).foundation();