From 0df7767f4a6c8fab7145684867fd657f94f8e8ca Mon Sep 17 00:00:00 2001 From: Marcin Zajkowski Date: Thu, 2 Nov 2017 17:32:20 +0100 Subject: [PATCH] Added no-dirty-check to search fields in all dialogs --- .../src/views/common/dialogs/iconpicker.html | 73 ++++--- .../src/views/common/dialogs/mediapicker.html | 61 +++--- .../common/dialogs/membergrouppicker.html | 32 +-- .../compositions/compositions.html | 24 +-- .../overlays/itempicker/itempicker.html | 32 +-- .../overlays/macropicker/macropicker.html | 13 +- .../usergrouppicker/usergrouppicker.html | 25 ++- .../application/umb-navigation.html | 194 +++++++++--------- 8 files changed, 224 insertions(+), 230 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html index 4e482c26b1..39ddebfaae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html @@ -1,7 +1,7 @@
-
-
- +
- + + No icons were found. + +
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html index 99102fed19..c8851194ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html @@ -61,22 +61,23 @@
+ on-drag-leave="dragLeave()" + on-drag-end="dragLeave()" + on-drag-enter="dragEnter()" + ng-hide="target"> + -
- - + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html index 48302cea02..e2ff9790d5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html @@ -1,7 +1,7 @@
- + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html index 3cc81fdcf6..64767d01cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html @@ -7,9 +7,10 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - localize="placeholder" - placeholder="@placeholders_filter" - umb-auto-focus> + localize="placeholder" + placeholder="@placeholders_filter" + umb-auto-focus + no-dirty-check>
@@ -17,20 +18,17 @@
- - + + - - + +
  • @@ -41,7 +39,7 @@ checklist-model="model.compositeContentTypes" checklist-value="compositeContentType.contentType.alias" ng-change="model.selectCompositeContentType(compositeContentType.contentType)" - ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited"/> + ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />