diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index 34e16daa..82f61fc7 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -49,8 +49,8 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\businesslogic.dll True @@ -61,12 +61,12 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\controls.dll True @@ -93,12 +93,12 @@ ..\packages\ImageProcessor.Web.4.5.3.0\lib\net45\ImageProcessor.Web.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\interfaces.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\log4net.dll True @@ -110,7 +110,7 @@ True - ..\packages\UmbracoCms.Core.7.4.1\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\Microsoft.ApplicationBlocks.Data.dll True @@ -165,8 +165,8 @@ ..\packages\semver.1.1.2\lib\net451\Semver.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\SQLCE4Umbraco.dll True @@ -176,11 +176,11 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.Entity.dll True @@ -224,39 +224,39 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.editorControls.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.MacroEngines.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\UmbracoExamine.dll True diff --git a/Notification/packages.config b/Notification/packages.config index 795bc72b..4e916ada 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -33,7 +33,7 @@ - + \ No newline at end of file diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index 4aeed101..741152dc 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -49,8 +49,8 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\businesslogic.dll True @@ -61,12 +61,12 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\controls.dll True @@ -93,12 +93,12 @@ ..\packages\ImageProcessor.Web.4.5.3.0\lib\net45\ImageProcessor.Web.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\interfaces.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\log4net.dll True @@ -110,7 +110,7 @@ True - ..\packages\UmbracoCms.Core.7.4.1\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\Microsoft.ApplicationBlocks.Data.dll True @@ -165,19 +165,19 @@ ..\packages\semver.1.1.2\lib\net451\Semver.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\SQLCE4Umbraco.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.Entity.dll True @@ -231,39 +231,39 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.editorControls.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.MacroEngines.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\UmbracoExamine.dll True diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 7ffc4d1b..e59eda36 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js index 7d75e25b..942b79ea 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js @@ -7,9 +7,18 @@ 'Failed to generate.') .then(function (result) { $scope.generating = false; + $scope.dashboard = result; }); }; + $scope.reload = function () { + $scope.ready = false; + modelsBuilderResource.getDashboard().then(function (result) { + $scope.dashboard = result; + $scope.ready = true; + }); + }; + function init() { modelsBuilderResource.getDashboard().then(function(result) { $scope.dashboard = result; diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm index 7d1716cb..5049e5f1 100644 --- a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm +++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm @@ -1,5 +1,9 @@ 
+
+ +
+

Models Builder

@@ -10,7 +14,8 @@
-

Models are out-of-date.

+

Models are out-of-date. +

@@ -26,6 +31,11 @@
+ +
+ Last generation failed with the following error: + 
{{dashboard.lastError}}
+
diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 77b4885e..5349ef6a 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -52,8 +52,8 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\businesslogic.dll True @@ -64,12 +64,12 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\controls.dll True @@ -104,8 +104,8 @@ ..\packages\UrlTracker.3.8\lib\InfoCaster.Umbraco.UrlTracker.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\interfaces.dll True @@ -113,7 +113,7 @@ ..\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll - ..\packages\UmbracoCms.Core.7.4.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\log4net.dll True @@ -125,7 +125,7 @@ True - ..\packages\UmbracoCms.Core.7.4.1\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\Microsoft.ApplicationBlocks.Data.dll True @@ -197,8 +197,8 @@ ..\packages\semver.1.1.2\lib\net451\Semver.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\SQLCE4Umbraco.dll True @@ -207,11 +207,11 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.Entity.dll True @@ -279,43 +279,43 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.editorControls.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.MacroEngines.dll True ..\packages\Umbraco.ModelsBuilder.3.0.0\lib\Umbraco.ModelsBuilder.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\UmbracoExamine.dll True diff --git a/OurUmbraco.Site/config/ClientDependency.config b/OurUmbraco.Site/config/ClientDependency.config index dc6d336c..86b700fb 100644 --- a/OurUmbraco.Site/config/ClientDependency.config +++ b/OurUmbraco.Site/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + - - - code - images/editor/code.gif - code - 1 - - + + + code + Code + images/editor/code.gif + code + 1 + + codemirror + Code mirror images/editor/code.gif codemirror 1 - removeformat - images/editor/removeformat.gif - removeformat - 2 - - - - Undo - images/editor/undo.gif - undo - 11 - - - Redo - images/editor/redo.gif - redo - 12 - - - Cut - images/editor/cut.gif - cut - 13 - - - Copy - images/editor/copy.gif - copy - 14 - - - - styleselect - images/editor/showStyles.png - styleselect - 20 - - - bold - images/editor/bold.gif - bold - 21 - - - italic - images/editor/italic.gif - italic - 22 - - - Underline - images/editor/underline.gif - underline - 23 - - - Strikethrough - images/editor/strikethrough.gif - strikethrough - 24 - - - - JustifyLeft - images/editor/justifyleft.gif - justifyleft - 31 - - - JustifyCenter - images/editor/justifycenter.gif - justifycenter - 32 - - - JustifyRight - images/editor/justifyright.gif - justifyright - 33 - - - JustifyFull - images/editor/justifyfull.gif - alignjustify - 34 - - - - bullist - images/editor/bullist.gif - bullist - 41 - - - numlist - images/editor/numlist.gif - numlist - 42 - - - Outdent - images/editor/outdent.gif - outdent - 43 - - - Indent - images/editor/indent.gif - indent - 44 - - - - mceLink - images/editor/link.gif - link - 51 - - - unlink - images/editor/unLink.gif - unlink - 52 - - - mceInsertAnchor - images/editor/anchor.gif - anchor - 53 - - - - mceImage - images/editor/image.gif - image - 61 - - - - umbracomacro - images/editor/insMacro.gif - umbracomacro - 62 - - - - - - mceInsertTable - images/editor/table.gif - table - 63 - - - - umbracoembed - images/editor/media.gif - umbracoembed - 66 - - - inserthorizontalrule - images/editor/hr.gif - hr - 71 - - - subscript - images/editor/sub.gif - subscript - 72 - - - - superscript - images/editor/sup.gif - superscript - 73 - - - - mceCharMap - images/editor/charmap.gif - charmap - 74 - - - - + removeformat + Remove format + images/editor/removeformat.gif + removeformat + 2 + + + undo + Undo + Remove Format + images/editor/undo.gif + undo + 11 + + + redo + Redo + images/editor/redo.gif + redo + 12 + + + cut + Cut + images/editor/cut.gif + cut + 13 + + + copy + Copy + images/editor/copy.gif + copy + 14 + + + paste + Paste + images/editor/paste.gif + paste + 15 + + + styleselect + Style select + images/editor/showStyles.png + styleselect + 20 + + + bold + Bold + images/editor/bold.gif + bold + 21 + + + italic + Italic + images/editor/italic.gif + italic + 22 + + + underline + Underline + images/editor/underline.gif + underline + 23 + + + strikethrough + Strikethrough + images/editor/strikethrough.gif + strikethrough + 24 + + + justifyleft + Justify left + images/editor/justifyleft.gif + justifyleft + 31 + + + justifycenter + Justify center + images/editor/justifycenter.gif + justifycenter + 32 + + + justifyright + Justify right + images/editor/justifyright.gif + justifyright + 33 + + + justifyfull + Justify full + images/editor/justifyfull.gif + alignjustify + 34 + + + bullist + Bullet list + images/editor/bullist.gif + bullist + 41 + + + numlist + Numbered list + images/editor/numlist.gif + numlist + 42 + + + outdent + Decrease indent + images/editor/outdent.gif + outdent + 43 + + + indent + Increase indent + images/editor/indent.gif + indent + 44 + + + mceLink + Insert/edit link + images/editor/link.gif + link + 51 + + + unlink + Remove link + images/editor/unLink.gif + unlink + 52 + + + mceInsertAnchor + Anchor + images/editor/anchor.gif + anchor + 53 + + + mceImage + Image + images/editor/image.gif + image + 61 + + + umbracomacro + Macro + images/editor/insMacro.gif + umbracomacro + 62 + + + mceInsertTable + Table + images/editor/table.gif + table + 63 + + + umbracoembed + Embed + images/editor/media.gif + umbracoembed + 66 + + + inserthorizontalrule + Horizontal rule + images/editor/hr.gif + hr + 71 + + + subscript + Subscript + images/editor/sub.gif + subscript + 72 + + + superscript + Superscript + images/editor/sup.gif + superscript + 73 + + + mceCharMap + Character map + images/editor/charmap.gif + charmap + 74 + + + code - codemirror - paste - umbracolink - anchor - charmap - table + codemirror + paste + umbracolink + anchor + charmap + table lists - hr - - - hr + + + - - font + + font - - - - raw - - { - "indentOnInit": false, - "path": "../../../../lib/codemirror", - "config": { - }, - "jsFiles": [ - ], - "cssFiles": [ - ] - } - - + + + + raw + + { + "indentOnInit": false, + "path": "../../../../lib/codemirror", + "config": { + }, + "jsFiles": [ + ], + "cssFiles": [ + ] + } + + \ No newline at end of file diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index bcc90849..dd606775 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -53,7 +53,7 @@ - + diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/iconpicker.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/iconpicker.html index bcf7fe32..260d8ff8 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/iconpicker.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/iconpicker.html @@ -2,55 +2,48 @@
- +
- +
- -
-
+ -
-
- +
diff --git a/OurUmbraco.Site/umbraco/Views/common/overlays/contenttypeeditor/compositions/compositions.html b/OurUmbraco.Site/umbraco/Views/common/overlays/contenttypeeditor/compositions/compositions.html index 9952f980..6554a037 100644 --- a/OurUmbraco.Site/umbraco/Views/common/overlays/contenttypeeditor/compositions/compositions.html +++ b/OurUmbraco.Site/umbraco/Views/common/overlays/contenttypeeditor/compositions/compositions.html @@ -32,7 +32,7 @@
  • + ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
    @@ -41,7 +41,7 @@ checklist-model="model.compositeContentTypes" checklist-value="compositeContentType.contentType.alias" ng-change="model.selectCompositeContentType(compositeContentType.contentType)" - ng-disabled="compositeContentType.allowed===false"/> + ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited"/>
    • -
    - +
    diff --git a/OurUmbraco.Site/umbraco/Views/components/tree/umb-tree-search-results.html b/OurUmbraco.Site/umbraco/Views/components/tree/umb-tree-search-results.html index e277ec63..97f08fe3 100644 --- a/OurUmbraco.Site/umbraco/Views/components/tree/umb-tree-search-results.html +++ b/OurUmbraco.Site/umbraco/Views/components/tree/umb-tree-search-results.html @@ -1,19 +1,23 @@ - + diff --git a/OurUmbraco.Site/umbraco/Views/components/umb-groups-builder.html b/OurUmbraco.Site/umbraco/Views/components/umb-groups-builder.html index dd4ed268..567d00c8 100644 --- a/OurUmbraco.Site/umbraco/Views/components/umb-groups-builder.html +++ b/OurUmbraco.Site/umbraco/Views/components/umb-groups-builder.html @@ -107,7 +107,7 @@
    * @animations - * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container - * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM + * | Animation | Occurs | + * |----------------------------------|-------------------------------------| + * | {@link ng.$animate#enter enter} | after the ngSwitch contents change and the matched child element is placed inside the container | + * | {@link ng.$animate#leave leave} | after the ngSwitch contents change and just before the former contents are removed from the DOM | * * @usage * @@ -29109,7 +29248,7 @@ var ngStyleDirective = ngDirective(function(scope, element, attr) { */ -var ngSwitchDirective = ['$animate', function($animate) { +var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) { return { require: 'ngSwitch', @@ -29150,7 +29289,7 @@ var ngSwitchDirective = ['$animate', function($animate) { selectedTransclude.transclude(function(caseElement, selectedScope) { selectedScopes.push(selectedScope); var anchor = selectedTransclude.element; - caseElement[caseElement.length++] = document.createComment(' end ngSwitchWhen: '); + caseElement[caseElement.length++] = $compile.$$createComment('end ngSwitchWhen'); var block = { clone: caseElement }; selectedElements.push(block); @@ -29232,7 +29371,7 @@ var ngSwitchDefaultDirective = ngDirective({ *
    *
    *
    - * {{text}} + * {{text}} *
    * * @@ -30266,7 +30405,9 @@ var minlengthDirective = function() { if (window.angular.bootstrap) { //AngularJS is already loaded, so we can return here... - console.log('WARNING: Tried to load angular more than once.'); + if (window.console) { + console.log('WARNING: Tried to load angular more than once.'); + } return; } diff --git a/OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/source.html b/OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/source.html index 807abbed..70cecb77 100644 --- a/OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/source.html +++ b/OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/source.html @@ -210,7 +210,7 @@ function submit() if (findDepth(curLineHTML, cc) !== 0) { // Cursor is inside a , don't set cursor: curLineHTML = curLineHTML.replace(cc, ''); - doc.setLine(pos.line, curLineHTML); + doc.getLineHandle(pos.line).text = curLineHTML; } // Submit HTML to TinyMCE: diff --git a/OurUmbraco.Site/umbraco_client/CodeArea/UmbracoEditor.js b/OurUmbraco.Site/umbraco_client/CodeArea/UmbracoEditor.js index 8f0faf2a..96ef28f5 100644 --- a/OurUmbraco.Site/umbraco_client/CodeArea/UmbracoEditor.js +++ b/OurUmbraco.Site/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(); } }, diff --git a/OurUmbraco.Site/umbraco_client/Dialogs/SortDialog.js b/OurUmbraco.Site/umbraco_client/Dialogs/SortDialog.js index a78d8687..fe13968d 100644 --- a/OurUmbraco.Site/umbraco_client/Dialogs/SortDialog.js +++ b/OurUmbraco.Site/umbraco_client/Dialogs/SortDialog.js @@ -22,11 +22,11 @@ s = s.replace(/\-/g, "/"); //all of these basically transform the string into year-month-day since that //is what JS understands when creating a Date object - if (c.dateFormat.indexOf("dd/MM/yyyy") == 0 || c.dateFormat.indexOf("dd-MM-yyyy") == 0) { - s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3-$2-$1"); + if (c.dateFormat.indexOf("dd/MM/yyyy") == 0 || c.dateFormat.indexOf("dd-MM-yyyy") == 0 || c.dateFormat.indexOf("dd.MM.yyyy") == 0) { + s = s.replace(/(\d{1,2})[\/\-\.](\d{1,2})[\/\-\.](\d{4})/, "$3-$2-$1"); } - else if (c.dateFormat.indexOf("dd/MM/yy") == 0 || c.dateFormat.indexOf("dd-MM-yy") == 0) { - s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$3-$2-$1"); + else if (c.dateFormat.indexOf("dd/MM/yy") == 0 || c.dateFormat.indexOf("dd-MM-yy") == 0 || c.dateFormat.indexOf("dd.MM.yy") == 0) { + s = s.replace(/(\d{1,2})[\/\-\.](\d{1,2})[\/\-\.](\d{2})/, "$3-$2-$1"); } else if (c.dateFormat.indexOf("MM/dd/yyyy") == 0 || c.dateFormat.indexOf("MM-dd-yyyy") == 0) { s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3-$1-$2"); @@ -118,4 +118,4 @@ -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/OurUmbraco.Site/umbraco_client/Editors/EditView.js b/OurUmbraco.Site/umbraco_client/Editors/EditView.js index 96ea4d14..87b180ce 100644 --- a/OurUmbraco.Site/umbraco_client/Editors/EditView.js +++ b/OurUmbraco.Site/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); diff --git a/OurUmbraco.Site/web.template.config b/OurUmbraco.Site/web.template.config index 4e437b8b..ad94ca23 100644 --- a/OurUmbraco.Site/web.template.config +++ b/OurUmbraco.Site/web.template.config @@ -37,7 +37,7 @@ Umbraco web.config configuration documentation can be found here: http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig --> - + diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj index 395bb42a..8449e133 100644 --- a/OurUmbraco/OurUmbraco.csproj +++ b/OurUmbraco/OurUmbraco.csproj @@ -38,8 +38,8 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll True     - - ..\packages\UmbracoCms.Core.7.4.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\businesslogic.dll True @@ -50,12 +50,12 @@ ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\controls.dll True @@ -86,8 +86,8 @@ ..\packages\ImageProcessor.Web.4.5.3.0\lib\net45\ImageProcessor.Web.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\interfaces.dll True @@ -95,7 +95,7 @@ True - ..\packages\UmbracoCms.Core.7.4.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\log4net.dll True @@ -111,7 +111,7 @@ True - ..\packages\UmbracoCms.Core.7.4.1\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\Microsoft.ApplicationBlocks.Data.dll True @@ -170,8 +170,8 @@ ..\packages\semver.1.1.2\lib\net451\Semver.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\SQLCE4Umbraco.dll True @@ -180,11 +180,11 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.4.1\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\System.Data.SqlServerCe.Entity.dll True @@ -222,7 +222,7 @@ ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll True - + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll True @@ -237,39 +237,39 @@ - ..\packages\UmbracoCms.Core.7.4.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.4.2\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.editorControls.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.MacroEngines.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.4.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.4.2\lib\UmbracoExamine.dll True diff --git a/OurUmbraco/packages.config b/OurUmbraco/packages.config index 1ff28d78..4209fab5 100644 --- a/OurUmbraco/packages.config +++ b/OurUmbraco/packages.config @@ -37,7 +37,7 @@ - +