From 0ec965bccb417934ce4f78c924110f6333ab2219 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 20 Dec 2013 20:15:29 +0400 Subject: [PATCH] Drag&Drop recipients emails on compose screen. --- dev/Styles/_InputosaurusFix.less | 5 ++ .../0.0.0/app/libraries/RainLoop/Service.php | 1 + .../app/libraries/RainLoop/ServiceActions.php | 2 +- rainloop/v/0.0.0/app/templates/Index.html | 2 +- rainloop/v/0.0.0/static/css/app.css | 4 ++ rainloop/v/0.0.0/static/css/app.min.css | 2 +- rainloop/v/0.0.0/static/js/admin.min.js | 6 +- rainloop/v/0.0.0/static/js/app.min.js | 14 ++--- rainloop/v/0.0.0/static/js/libs.js | 2 +- vendors/inputosaurus/inputosaurus.js | 61 +++++++++++++++++-- vendors/inputosaurus/inputosaurus.min.js | 2 +- 11 files changed, 80 insertions(+), 21 deletions(-) diff --git a/dev/Styles/_InputosaurusFix.less b/dev/Styles/_InputosaurusFix.less index 0fe753dff..84e578e51 100644 --- a/dev/Styles/_InputosaurusFix.less +++ b/dev/Styles/_InputosaurusFix.less @@ -17,6 +17,11 @@ padding: 2px 15px 2px 5px; margin: 2px 2px 2px; color: #555; + z-index: 100; + + &.ui-draggable.ui-draggable-dragging { + z-index: 101; + } position: relative; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php index 04a264a88..242bf5ba6 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php @@ -171,6 +171,7 @@ class Service { $sJsBoot = \file_get_contents(APP_VERSION_ROOT_PATH.'static/js/boot.js'); $sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'), array( + '{{BaseRandHash}}' => \md5(\rand(1000, 9000).\microtime(true)), '{{BaseAppDataScriptLink}}' => ($bAdmin ? APP_INDEX_FILE.'?/AdminAppData/' : APP_INDEX_FILE.'?/AppData/'), '{{BaseAppIndexFile}}' => APP_INDEX_FILE, '{{BaseAppFaviconIcoFile}}' => $aData['FaviconIcoLink'], diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php index b90685c92..a15a6d9b5 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php @@ -884,7 +884,7 @@ class ServiceActions @\header('Content-Type: application/javascript; charset=utf-8'); @\header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); @\header('Last-Modified: '.\gmdate('D, d M Y H:i:s').' GMT'); - @\header('Cache-Control: no-store, no-cache, must-revalidate'); + @\header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0'); @\header('Cache-Control: post-check=0, pre-check=0', false); @\header('Pragma: no-cache'); diff --git a/rainloop/v/0.0.0/app/templates/Index.html b/rainloop/v/0.0.0/app/templates/Index.html index 4c44905d6..4097f0296 100644 --- a/rainloop/v/0.0.0/app/templates/Index.html +++ b/rainloop/v/0.0.0/app/templates/Index.html @@ -30,7 +30,7 @@