From 0877a69a3e3cbfbc34c11de2b08190204473f123 Mon Sep 17 00:00:00 2001 From: Per Ploug Krogslund Date: Sun, 28 Jul 2013 00:41:28 +0200 Subject: [PATCH] Removed trailing space from ngdoc declaration --- .../docs/html/readme.html | 14 ++-- src/Umbraco.Web.UI.Client/gruntFile.js | 2 +- .../src/_legacy/auth.resource.js | 2 +- .../src/_legacy/tree.resource.js | 2 +- .../common/directives/autoscale.directive.js | 17 +++++ .../common/directives/fileupload.directive.js | 3 +- .../common/directives/headline.directive.js | 4 ++ .../directives/preventdefault.directive.js | 4 ++ .../common/directives/umbavatar.directive.js | 4 +- .../common/directives/umbconfirm.directive.js | 6 +- .../directives/umbcontentname.directive.js | 5 +- .../common/directives/umbeditor.directive.js | 32 +++++++++ .../common/directives/umbheader.directive.js | 70 +++++++++++++++++++ .../common/directives/umblogin.directive.js | 6 +- .../directives/umbnavigation.directive.js | 4 +- .../directives/umbnotifications.directive.js | 7 +- .../common/directives/umbpanel.directive.js | 4 +- .../directives/umbproperty.directive.js | 4 +- .../src/common/directives/umbtab.directive.js | 4 +- .../common/directives/umbtabview.directive.js | 4 +- .../common/directives/umbtree.directive.js | 4 +- .../directives/umbtreeitem.directive.js | 6 +- .../directives/valpropertymsg.directive.js | 4 +- .../common/directives/valregex.directive.js | 4 +- .../common/directives/valserver.directive.js | 4 +- .../directives/valserverfield.directive.js | 4 +- .../directives/valshowvalidation.directive.js | 5 +- .../src/common/directives/valtab.directive.js | 4 +- .../directives/valtogglemsg.directive.js | 2 +- .../common/filters/treeiconclass.filter.js | 4 +- .../common/filters/treeiconstyle.filter.js | 8 +-- .../src/common/mocks/resources/_utils.js | 1 + .../mocks/resources/section.resource.js | 9 +-- .../src/common/resources/auth.resource.js | 6 +- .../src/common/resources/content.resource.js | 4 +- .../common/resources/contenttype.resource.js | 2 +- .../src/common/resources/legacy.resource.js | 3 +- .../src/common/resources/media.resource.js | 2 +- .../common/resources/mediatype.resource.js | 2 +- .../src/common/resources/section.resource.js | 2 +- .../src/common/resources/tree.resource.js | 2 +- .../services/servervalidationmgr.service.js | 6 +- .../src/common/services/util.service.js | 14 ++-- .../src/views/content/edit.html | 19 ++++- .../src/views/directives/umb-header.html | 3 +- .../src/views/directives/umb-property.html | 3 - .../datepicker/datepicker.controller.js | 6 +- .../umbraco/Views/directives/umb-header.html | 3 +- 48 files changed, 238 insertions(+), 96 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/umbheader.directive.js diff --git a/src/Umbraco.Web.UI.Client/docs/html/readme.html b/src/Umbraco.Web.UI.Client/docs/html/readme.html index 20830e7ae8..226d3a25d1 100644 --- a/src/Umbraco.Web.UI.Client/docs/html/readme.html +++ b/src/Umbraco.Web.UI.Client/docs/html/readme.html @@ -114,11 +114,12 @@

The super fast introduction to getting belle running on your local machine, both as a pre-built environment, and with the full setup with unit-tests, grunt-tasks and node.

Running the prebuilt site

Windows

-

Right-click the /build folder and choose "open in webmatrix", run the website in webmatrix and browse to localhost:xxxx/Belle/, this should display the Belle login screen

+

Right-click the /build folder and choose "open in webmatrix", run the website in webmatrix and browse to localhost:9999/Belle/, this should display the Belle login screen

+

Port 9999 should be used because that is the target site that the grunt build command mentioned below will launch

OSX

Open a terminal inside the "/build" folder and run the command:

-
python -m SimpleHTTPServer 8080
-

This will start a local webserver, hosting the site on localhost:8080 browse to localhost:8080/Belle/ which should display the belle login screen.

+
python -m SimpleHTTPServer 9999
+

This will start a local webserver, hosting the site on localhost:9999 browse to localhost:9999/Belle/ which should display the belle login screen.

Uing the dev environment

The dev environment is tad more tricky to get running, since it depends on a number of unit tests and automated tools, to produce the contents of the /build folder

The dev environment is cross platform, so will work on both osx and windows, and do not currently have any dependencies to .net

@@ -137,11 +138,10 @@

note: On OSX you might need to run:

sudo npm install grunt-cli -g

Now that you have node and grunt installed, you can open /Umbraco.Belle.Client in either cmd.exe or terminal and run:

-
grunt
-

This will build the site, merge less files, run tests and create the /Build folder.

+
grunt dev
+

This will build the site, merge less files, run tests and create the /Build folder, launch the web browser and monitor changes.

Automated builds and tests

-

If you prefer to do test-driven developement, or just dont want to manually run grunt on every change, you can simply tell grunt to watch for any changes made in the project, by running:

-
grunt watch
+

grunt dev will continue to run in the background monitoring changes to files. When changes are detected it will rebuild the JS and also run the unit tests.

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index a118085506..300155c4dc 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -240,7 +240,7 @@ module.exports = function (grunt) { title: "Umbraco 7" }, api: { - src: ['src/common/services/**/*.js'], + src: ['src/common/**/*.js'], title: 'API Documentation' }, tutorials: { diff --git a/src/Umbraco.Web.UI.Client/src/_legacy/auth.resource.js b/src/Umbraco.Web.UI.Client/src/_legacy/auth.resource.js index ec9ac6e5ba..32e26e7ce7 100644 --- a/src/Umbraco.Web.UI.Client/src/_legacy/auth.resource.js +++ b/src/Umbraco.Web.UI.Client/src/_legacy/auth.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.authResource * @description Loads in data for authentication **/ diff --git a/src/Umbraco.Web.UI.Client/src/_legacy/tree.resource.js b/src/Umbraco.Web.UI.Client/src/_legacy/tree.resource.js index 109f3dc6a7..1146480f16 100644 --- a/src/Umbraco.Web.UI.Client/src/_legacy/tree.resource.js +++ b/src/Umbraco.Web.UI.Client/src/_legacy/tree.resource.js @@ -1,5 +1,5 @@ /** -* @ngdoc service +* @ngdoc service * @name umbraco.resources.treeResource * @description Loads in data for trees **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/autoscale.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/autoscale.directive.js index b1604ce627..2509974e51 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/autoscale.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/autoscale.directive.js @@ -1,3 +1,20 @@ +/** + * @ngdoc directive + * @name umbraco.directives.directive:autoScale + * @element div + * @function + * + * @description + * Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set + * So if you only want to scale the div to 70 pixels from the bottom you pass "70" + * + * @example + + +
+ + + */ angular.module("umbraco.directives") .directive('autoScale', function ($window) { return function (scope, el, attrs) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/fileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/fileupload.directive.js index 8cc094c110..4506591a3c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/fileupload.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/fileupload.directive.js @@ -1,6 +1,7 @@ /** -* @ngdoc object +* @ngdoc directive * @name umbraco.directives.directive:umbFileUpload +* @function * @restrict AE * @element ANY * @scope diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/headline.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/headline.directive.js index 8336538dbe..4f180a7a83 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/headline.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/headline.directive.js @@ -1,3 +1,7 @@ +/** +* @ngdoc directive +* @name umbraco.directives.directive:headline +**/ angular.module("umbraco.directives") .directive('headline', function ($window) { return function (scope, el, attrs) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/preventdefault.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/preventdefault.directive.js index bc75b3f7d8..315f5da31f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/preventdefault.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/preventdefault.directive.js @@ -1,3 +1,7 @@ +/** +* @ngdoc directive +* @name umbraco.directives.directive:preventDefault +**/ angular.module("umbraco.directives") .directive('preventDefault', function () { return function (scope, element, attrs) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbavatar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbavatar.directive.js index e38e3cc1de..0702d7207c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbavatar.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbavatar.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directives.directive:login +* @ngdoc directive +* @name umbraco.directives.directive:umbAvatar * @restrict E **/ function avatarDirective() { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbconfirm.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbconfirm.directive.js index 7d211176b9..fa4f2b69b1 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbconfirm.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbconfirm.directive.js @@ -1,7 +1,7 @@ /** - * @ngdoc object - * @name umbraco.directives:umbConfirm - * + * @ngdoc directive + * @name umbraco.directives.directive:umbConfirm + * @function * @description * A confirmation dialog * diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbcontentname.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbcontentname.directive.js index c34a146c6f..520a7ea6a9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbcontentname.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbcontentname.directive.js @@ -1,7 +1,8 @@ /** -* @ngdoc object -* @name umbraco.directive:umbContentName +* @ngdoc directive +* @name umbraco.directives.directive:umbContentName * @restrict E +* @function * @description * Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form. **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js new file mode 100644 index 0000000000..a0b85ed8d2 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js @@ -0,0 +1,32 @@ +/** +* @ngdoc directive +* @function +* @name umbraco.directives.directive:umbEditor +* @restrict E +**/ +angular.module("umbraco.directives") + .directive('umbEditor', function (umbPropEditorHelper) { + return { + scope: { + view: "@", + alias: "@", + label: "@", + description: "@", + value: "=" + }, + restrict: 'E', + replace: true, + templateUrl: 'views/directives/umb-property.html', + link: function (scope, element, attrs, ctrl) { + + scope.model = {}; + scope.model.view = scope.view; + scope.model.alias = scope.alias || Math.random().toString(36).slice(2); + scope.model.description = scope.description; + scope.model.value = scope.value; + scope.model.label = scope.label; + + scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.view); + } + }; + }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbheader.directive.js new file mode 100644 index 0000000000..8187c20ba0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbheader.directive.js @@ -0,0 +1,70 @@ +angular.module("umbraco.directives") +.directive('umbHeader', function($parse, $timeout){ + return { + restrict: 'E', + replace: true, + transclude: 'true', + templateUrl: 'views/directives/umb-header.html', + //create a new isolated scope assigning a tabs property from the attribute 'tabs' + //which is bound to the parent scope property passed in + scope: { + tabs: "=" + }, + link: function (scope, iElement, iAttrs) { + + if (!iAttrs.tabs){ + throw "a 'tabs' attribute must be set for umbHeader which represents the collection of tabs"; + } + //var hasProcessed = false; + + scope.collectedTabs = []; + + //when the tabs change, we need to hack the planet a bit and force the first tab content to be active, + //unfortunately twitter bootstrap tabs is not playing perfectly with angular. + scope.$watch("tabs", function (newValue, oldValue) { + + $(newValue).each(function(i, val){ + scope.collectedTabs.push({id: val.id, label: val.label}); + }); + //scope.collectedTabs = newValue; + + //don't process if we cannot or have already done so + if (!newValue) {return;} + //if (hasProcessed || !newValue.length || newValue.length == 0) return; + if (!newValue.length || newValue.length === 0){return;} + + //set the flag + //hasProcessed = true; + + var $panes = $('div.tab-content'); + var activeTab = _.find(newValue, function (item) { + return item.active; + }); + + //we need to do a timeout here so that the current sync operation can complete + // and update the UI, then this will fire and the UI elements will be available. + $timeout(function () { + $panes.find('.tab-pane').each(function (index) { + var $this = angular.element(this); + var id = $this.attr("rel"); + var label = $this.attr("data-label"); + + if ($this.attr("rel") === String(activeTab.id)) { + $this.addClass('active'); + } + else { + $this.removeClass('active'); + } + + //this is sorta hacky since we add a tab object to the tabs collection + //based on a dom element, there is most likely a better way... + if (label) { + scope.collectedTabs.push({id: id, label: label}); + } + }); + }); + + }); + } + }; +}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umblogin.directive.js index 05566dd834..e2c5cc7e6a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umblogin.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umblogin.directive.js @@ -1,6 +1,8 @@ /** -* @ngdoc object -* @name umbraco.directive:login +* @ngdoc directive +* @name umbraco.directives.directive:login +* @function +* @element ANY * @restrict E **/ function loginDirective() { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js index 67fe00cc0b..c2698d2c59 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbNavigation +* @ngdoc directive +* @name umbraco.directives.directive:umbNavigation * @restrict E **/ function leftColumnDirective() { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbnotifications.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbnotifications.directive.js index 7a64825943..e1c1593dd0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbnotifications.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbnotifications.directive.js @@ -1,8 +1,7 @@ /** -* @ngdoc object -* @name umbraco.directive:notifications -* @restrict E -**/ + * @ngdoc directive + * @name umbraco.directives.directive:umbNotifications + */ function notificationDirective() { return { restrict: "E", // restrict to an element diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbpanel.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbpanel.directive.js index 9b717be662..6bd119ce26 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbpanel.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbpanel.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbPanel +* @ngdoc directive +* @name umbraco.directives.directive:umbPanel * @restrict E **/ angular.module("umbraco.directives") diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js index 15e8532cab..7a91cc12f8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbProperty +* @ngdoc directive +* @name umbraco.directives.directive:umbProperty * @restrict E **/ angular.module("umbraco.directives") diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtab.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtab.directive.js index dd6d1ad39f..3758c64179 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtab.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtab.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbTab +* @ngdoc directive +* @name umbraco.directives.directive:umbTab * @restrict E **/ angular.module("umbraco.directives") diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtabview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtabview.directive.js index 4bdea17c2e..ce17a8a82f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtabview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtabview.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbTabView +* @ngdoc directive +* @name umbraco.directives.directive:umbTabView * @restrict E **/ angular.module("umbraco.directives") diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js index 7a55a3b419..84b6f76b82 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directive:umbTree +* @ngdoc directive +* @name umbraco.directives.directive:umbTree * @restrict E **/ angular.module("umbraco.directives") diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js index 5fa4c261d6..a300d5dc5c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js @@ -1,6 +1,6 @@ /** - * @ngdoc object - * @name umbraco.directives:umbTreeItem + * @ngdoc directive + * @name umbraco.directives.directive:umbTreeItem * @element li * @function * @@ -11,7 +11,7 @@ * **note:** This directive is only used internally in the umbTree directive * * @example - + diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valpropertymsg.directive.js index 9fd267d7f9..ffc06eb446 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valpropertymsg.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valpropertymsg.directive.js @@ -1,6 +1,6 @@ /** -* @ngdoc object -* @name umbraco.directives:valPropertyMsg +* @ngdoc directive +* @name umbraco.directives.directive:valPropertyMsg * @restrict A * @element textarea * @requires formController diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valregex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valregex.directive.js index 9de10e53be..dbe751ec23 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valregex.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valregex.directive.js @@ -1,6 +1,6 @@ /** - * @ngdoc object - * @name umbraco.directive:valRegex + * @ngdoc directive + * @name umbraco.directives.directive:valRegex * @restrict A * @description A custom directive to allow for matching a value against a regex string. * NOTE: there's already an ng-pattern but this requires that a regex expression is set, not a regex string diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valserver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valserver.directive.js index 4a4da12915..2d4733c9f7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valserver.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valserver.directive.js @@ -1,6 +1,6 @@ /** - * @ngdoc object - * @name umbraco.directive:valServer + * @ngdoc directive + * @name umbraco.directives.directive:valServer * @restrict A * @description This directive is used to associate a content property with a server-side validation response * so that the validators in angular are updated based on server-side feedback. diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valserverfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valserverfield.directive.js index 086285d693..3e71061bfe 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valserverfield.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valserverfield.directive.js @@ -1,6 +1,6 @@ /** - * @ngdoc object - * @name umbraco.directive:valServerField + * @ngdoc directive + * @name umbraco.directives.directive:valServerField * @restrict A * @description This directive is used to associate a content field (not user defined) with a server-side validation response * so that the validators in angular are updated based on server-side feedback. diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valshowvalidation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valshowvalidation.directive.js index 2479ad6114..810b8dbe52 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valshowvalidation.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valshowvalidation.directive.js @@ -1,7 +1,6 @@ - /** -* @ngdoc object -* @name umbraco.directive:valShowValidation +* @ngdoc directive +* @name umbraco.directives.directive:valShowValidation * @restrict A * @description Used to toggle the show-validation class on the element containing the form elements to validate. * This is used because we don't want to show validation messages until after the form is submitted and then reset diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valtab.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valtab.directive.js index f5960bacdb..3fc3641c30 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valtab.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valtab.directive.js @@ -1,7 +1,7 @@ /** -* @ngdoc object -* @name umbraco.directive:valTab +* @ngdoc directive +* @name umbraco.directives.directive:valTab * @restrict A * @description Used to show validation warnings for a tab to indicate that the tab content has validations errors in its data. **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/valtogglemsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/valtogglemsg.directive.js index 29b444c456..794a9a5b03 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/valtogglemsg.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/valtogglemsg.directive.js @@ -50,7 +50,7 @@ function valToggleMsg(serverValidationManager) { } /** -* @ngdoc object +* @ngdoc directive * @name umbraco.directives.directive:valToggleMsg * @restrict A * @element input diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/treeiconclass.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/treeiconclass.filter.js index c13c9c980a..9fb1437b64 100644 --- a/src/Umbraco.Web.UI.Client/src/common/filters/treeiconclass.filter.js +++ b/src/Umbraco.Web.UI.Client/src/common/filters/treeiconclass.filter.js @@ -1,6 +1,6 @@ /** -* @ngdoc filter -* @name umbraco.filters:umbTreeIconClass +* @ngdoc filter +* @name umbraco.filters.filter:umbTreeIconClass * @description This will properly render the tree icon class based on the tree icon set on the server **/ function treeIconClassFilter(iconHelper) { diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/treeiconstyle.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/treeiconstyle.filter.js index b36dd6e8cb..568fc02f4c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/filters/treeiconstyle.filter.js +++ b/src/Umbraco.Web.UI.Client/src/common/filters/treeiconstyle.filter.js @@ -1,8 +1,8 @@ /** - * @ngdoc filter - * @name umbraco.filters:umbTreeIconImage - * @description This will properly render the tree icon image based on the tree icon set on the server - **/ +* @ngdoc filter +* @name umbraco.filters.filter:umbTreeIconImage +* @description This will properly render the tree icon image based on the tree icon set on the server +**/ function treeIconStyleFilter(iconHelper) { return function (treeNode) { if (treeNode.iconIsClass) { diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js index a445764f67..0a61c25617 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js @@ -13,6 +13,7 @@ name: "My content with id: " + id, updateDate: new Date(), publishDate: new Date(), + createDate: new Date(), id: id, parentId: 1234, icon: "icon-file-alt", diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js index 632885b643..af57138235 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js @@ -1,8 +1,9 @@ /** - * @ngdoc service - * @name umbraco.mocks.sectionMocks - * @description Mocks data retreival for the sections - **/ +* @ngdoc service +* @name umbraco.mocks.sectionMocks +* @description +* Mocks data retrival for the sections +**/ function sectionMocks($httpBackend, mocksUtils) { /** internal method to mock the sections to be returned */ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js index ae3d8eaa02..bac585c86e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js @@ -1,7 +1,7 @@ /** -* @ngdoc service -* @name umbraco.resources.authResource -* @description Loads in data for authentication + * @ngdoc service + * @name umbraco.resources.authResource + * @description Loads in data for authentication **/ function authResource($q, $http, umbRequestHelper) { diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 91d4196974..409f22cc55 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -1,8 +1,8 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.contentResource * @description Loads/saves in data for content - **/ +**/ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { /** internal method process the saving of data and post processing the result */ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js index 10ad5751af..ad1e21d2e0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.contentTypeResource * @description Loads in data for content types **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js index 11108e12c9..47006d7ae8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/legacy.resource.js @@ -1,10 +1,9 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.legacyResource * @description Handles legacy dialog requests **/ function legacyResource($q, $http, umbRequestHelper) { - //the factory object returned return { diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js index d01ff6d59c..10de548a58 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.mediaResource * @description Loads in data for media **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js index b1949d1c86..bcd6450352 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.mediaTypeResource * @description Loads in data for media types **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js index 4374d2e4d0..7be1e51cce 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/section.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.sectionResource * @description Loads in data for section **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js index 02b825ca91..51d00904ce 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js @@ -1,5 +1,5 @@ /** - * @ngdoc service + * @ngdoc service * @name umbraco.resources.treeResource * @description Loads in data for trees **/ diff --git a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js index cf844b0e4e..dac58b58e8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js @@ -39,8 +39,8 @@ function serverValidationManager($timeout) { /** * @ngdoc function - * @name subscribe - * @methodOf umbraco.services.executeAndClearAllSubscriptions + * @name umbraco.services.serverValidationManager#subscribe + * @methodOf umbraco.services.serverValidationManager * @function * * @description @@ -78,7 +78,7 @@ function serverValidationManager($timeout) { /** * @ngdoc function - * @name subscribe + * @name umbraco.services.serverValidationManager#subscribe * @methodOf umbraco.services.serverValidationManager * @function * diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 24e258f0ab..60d12f376a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -671,9 +671,9 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser return { /** - * @ngdoc function - * @name handleValidationErrors - * @methodOf ContentEditController + * @ngdoc method + * @name umbraco.services.contentEditingHelper#handleValidationErrors + * @methodOf umbraco.services.contentEditingHelper * @function * * @description @@ -734,8 +734,8 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser /** * @ngdoc function - * @name handleSaveError - * @methodOf ContentEditController + * @name umbraco.services.contentEditingHelper#handleSaveError + * @methodOf umbraco.services.contentEditingHelper * @function * * @description @@ -776,8 +776,8 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser /** * @ngdoc function - * @name redirectToCreatedContent - * @methodOf ContentEditController + * @name umbraco.services.contentEditingHelper#redirectToCreatedContent + * @methodOf umbraco.services.contentEditingHelper * @function * * @description diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index 28e59c0c6d..eaf420738f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -33,10 +33,23 @@ - - - + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-header.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-header.html index 3519eee9ac..2e2e552ce7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-header.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-header.html @@ -4,8 +4,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html index 7ebb343abc..f6de816b9c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html @@ -1,6 +1,5 @@
-
@@ -9,7 +8,6 @@
@@ -19,6 +17,5 @@
- diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 153f55ce63..f7021a955a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -3,7 +3,6 @@ angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", scriptLoader.load([ 'views/propertyeditors/datepicker/bootstrap.datepicker.js', - 'css!/belle/views/propertyeditors/datepicker/bootstrap.datepicker.css' ]).then( function () { //The Datepicker js and css files are available and all components are ready to use. @@ -20,4 +19,9 @@ angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", $scope.model.value = e.date.toISOString(); }); }); + + + scriptLoader.load([ + 'css!/belle/views/propertyeditors/datepicker/bootstrap.datepicker.css' + ]); }); diff --git a/src/Umbraco.Web.UI/umbraco/Views/directives/umb-header.html b/src/Umbraco.Web.UI/umbraco/Views/directives/umb-header.html index 3519eee9ac..2e2e552ce7 100644 --- a/src/Umbraco.Web.UI/umbraco/Views/directives/umb-header.html +++ b/src/Umbraco.Web.UI/umbraco/Views/directives/umb-header.html @@ -4,8 +4,7 @@