From f361e286ed1ede700fa80e90ffae2cc80b0fad06 Mon Sep 17 00:00:00 2001 From: Jeremy Pyne Date: Fri, 11 Mar 2016 14:44:21 -0500 Subject: [PATCH 1/5] This minor fix will restore the editors cursor in CoreArea editor boxes when they save the item. There is a check included to prevent this behavior is the server level code changes the file for some reason as then the cursor location could act unpredictably, so instead we just let it reset to the beginning of the file. --- .../umbraco_client/CodeArea/UmbracoEditor.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js b/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js index 8f0faf2a28..96ef28f53c 100644 --- a/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js +++ b/src/Umbraco.Web.UI/umbraco_client/CodeArea/UmbracoEditor.js @@ -35,9 +35,18 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls.CodeEditor"); this._control.val(code); } else { - //this is a wrapper for CodeMirror + //this is a wrapper for CodeMirror this._editor.focus(); + + var codeChanged = this._editor.getValue() != code; + var cursor = this._editor.doc.getCursor(); + this._editor.setValue(code); + + // Restore cursor position if the server saved code matches. + if (!codeChanged) + this._editor.setCursor(cursor); + this._editor.focus(); } }, From 91da14b0c6cee10b3c2a8787b6bd1e24e2539572 Mon Sep 17 00:00:00 2001 From: Jeremy Pyne Date: Fri, 11 Mar 2016 14:56:55 -0500 Subject: [PATCH 2/5] Second fix for partial views. --- src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js index b7239f8a0f..c3084e439e 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js @@ -174,6 +174,9 @@ } if (args.contents) { UmbEditor.SetCode(args.contents); + } else if (!this.IsSimpleEditor) { + // Restore focuse to text region. SetCode also does this. + UmbEditor._editor.focus(); } UmbClientMgr.mainTree().setActiveTreeType(this._opts.currentTreeType); From 7a7e0edfa796a5dde8cdd63dcc0d9daf13f197dc Mon Sep 17 00:00:00 2001 From: bjarnef Date: Tue, 15 Mar 2016 23:59:11 +0100 Subject: [PATCH 3/5] Don't set dirty on form for examine dashboard search --- .../src/views/dashboard/developer/examinemanagement.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html index baa0ca520c..615b8a6190 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html @@ -166,17 +166,17 @@
- +
From 99b2192ab71568ffe95cc9aa99329843513f6b97 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Thu, 17 Mar 2016 09:58:57 +0100 Subject: [PATCH 4/5] Fixes U4-8181 It is not possible to scroll in an overlay in Chrome 49 on a Retina Mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By removing animated -half-second fadeIn it resolves the issue where it's not possible to scroll in dialogs on a retina screen ¯\_(ツ)_/¯ --- .../src/views/components/editor/umb-editor-view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html index a10ff503b9..f99603afa4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html @@ -1,4 +1,4 @@ -
Date: Thu, 17 Mar 2016 10:33:04 +0100 Subject: [PATCH 5/5] Fixes broken regex. --- .../listview/layouts/grid/grid.listviewlayout.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js index a6de5f3016..e1754dd89d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js @@ -16,7 +16,7 @@ vm.nodeId = $scope.contentId; //vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes); //instead of passing in a whitelist, we pass in a blacklist by adding ! to the ext - vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/./g, "!."); + vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/\./g, "!."); vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB"; vm.activeDrag = false;