wait #5961 @0:10

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index da1df597c88f342eb10b254cd30eee08cdd2795e..414f194df212639e43fd819a8b4b2f7b5f6a31d3 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -17,7 +17,7 @@ class Farm
         ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 2, 'region' => 'US'],
         ['name' => 'clockwork', 'host' => 'clockwork.cubedesigners.com', 'weight' => 2, 'region' => 'UE'],
         ['name' => 'dracula', 'host' => 'dracula.cubedesigners.com', 'weight' => 3, 'region' => 'UE'],
-        ['name' => 'elephantman', 'host' => 'elephantman.cubedesigners.com', 'weight' => 1, 'region' => 'UE'],
+        ['name' => 'elephantman', 'host' => 'paris.cubedesigners.com', 'weight' => 1, 'region' => 'UE'],
         ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'weight' => 1, 'region' => 'UE'],
         ['name' => 'godzilla', 'host' => 'godzilla.cubedesigners.com', 'weight' => 3, 'region' => 'UE'],
         ['name' => 'her', 'host' => 'her2.cubedesigners.com', 'weight' => 4, 'region' => 'UE'],

diff --git a/resources/linkeditor/js/linkeditor.utils.js b/resources/linkeditor/js/linkeditor.utils.js
index d66a21fdb317b3bb136e8ebc58e8954ce8c46727..215c8c9f22377cd66684011b93df423401a5e4ee 100644 (file)
--- a/resources/linkeditor/js/linkeditor.utils.js
+++ b/resources/linkeditor/js/linkeditor.utils.js
@@ -143,7 +143,7 @@ LinkeditorUtils.prototype = {
             r2.bottom < r1.top);
     },
     isfocusOnFormItem: function () {
-        return $(document.activeElement).is('input[type="text"],input[type="email"],input[type="number"],input[type="tel"],textarea,select');
+        return $(document.activeElement).is('input[type="text"],input[type="email"],input[type="number"],input[type="tel"],,input[type="search"],textarea,select');
     }
 };