From f2f191fe1275900ce8ce46e795fb6ae0fec675b8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 6 Jul 2014 22:40:00 +0100
Subject: [PATCH] Upgrade jQuery to 1.11.1 and jQuery UI to 1.11.0

---
 CRM/Core/Resources.php | 10 +++++-----
 css/civicrm.css        |  4 ++--
 css/dashboard.css      |  2 +-
 js/Common.js           |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 706d80de9a..9064f1a54d 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -587,9 +587,9 @@ class CRM_Core_Resources {
     // Scripts needed by everyone, everywhere
     // FIXME: This is too long; list needs finer-grained segmentation
     $items = array(
-      "packages/jquery/jquery-1.11.0$min.js",
-      "packages/jquery/jquery-ui/js/jquery-ui-1.10.4.custom$min.js",
-      "packages/jquery/jquery-ui/css/theme/jquery-ui-1.10.4.custom$min.css",
+      "packages/jquery/jquery-1.11.1$min.js",
+      "packages/jquery/jquery-ui/jquery-ui$min.js",
+      "packages/jquery/jquery-ui/jquery-ui$min.css",
 
       "packages/backbone/lodash.compat$min.js",
 
@@ -635,9 +635,9 @@ class CRM_Core_Resources {
     if ($config->lcMessages && $config->lcMessages != 'en_US') {
       // Search for i18n file in order of specificity (try fr-CA, then fr)
       list($lang) = explode('_', $config->lcMessages);
-      $path = "packages/jquery/jquery-ui/development-bundle/ui/" . ($min ? 'minified/' : '') . "i18n";
+      $path = "packages/jquery/jquery-ui/i18n";
       foreach (array(str_replace('_', '-', $config->lcMessages), $lang) as $language) {
-        $localizationFile = "$path/jquery.ui.datepicker-{$language}{$min}.js";
+        $localizationFile = "$path/datepicker-{$language}.js";
         if ($this->getPath('civicrm', $localizationFile)) {
           $items[] = $localizationFile;
           break;
diff --git a/css/civicrm.css b/css/civicrm.css
index c618104ea8..bdb6defb4d 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2603,7 +2603,7 @@ div.grippie {
 }
 
 .crm-container .dark-icon {
-  background-image: url("../packages/jquery/jquery-ui/css/theme/images/ui-icons_222222_256x240.png")
+  background-image: url("../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png")
 }
 .crm-container .edit-icon {
   background-position: -64px -112px;
@@ -2918,7 +2918,7 @@ div.grippie {
 }
 
 .crm-status-box-outer.status-start {
-  background: #F8FF03 url("../packages/jquery/jquery-ui/css/theme/images/animated-overlay.gif");
+  background: #F8FF03 url("../packages/jquery/jquery-ui/images/animated-overlay.gif");
 }
 
 .crm-status-box-outer .crm-status-box-inner {
diff --git a/css/dashboard.css b/css/dashboard.css
index 739aa51a06..8bb75fb8bc 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -95,7 +95,7 @@
 }
 
 #crm-container .widget-icon {
-  background-image:url('../packages/jquery/jquery-ui/css/theme/images/ui-icons_222222_256x240.png');
+  background-image:url('../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png');
   height:16px;
   width:16px;
   padding-right:2px;
diff --git a/js/Common.js b/js/Common.js
index 34af6d67c1..fa3c910722 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -524,12 +524,12 @@ CRM.validate = CRM.validate || {
             $el.data('origSize', null);
           } else {
             $el.data('origSize', {
-              position: 'center',
+              position: {my: 'center', at: 'center', of: window},
               width: $el.dialog('option', 'width'),
               height: $el.dialog('option', 'height')
             });
             var menuHeight = $('#civicrm-menu').height();
-            $el.dialog('option', {width: '100%', height: ($(window).height() - menuHeight), position: [0, menuHeight]});
+            $el.dialog('option', {width: '100%', height: ($(window).height() - menuHeight), position: {my: "top", at: "top+"+menuHeight, of: window}});
           }
           e.preventDefault();
         });
-- 
2.25.1