yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5003

Browse Source
This commit is contained in:
Shannon
2014-08-18 11:38:09 -06:00
parent 9d95e9f4d3 53097a9b84
commit 895ecf5f16
9 changed files with 344 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/common/directives/utill/nodirtycheck.directive.js Normal file
View File

@@ -0,0 +1,18 @@
/**
* @ngdoc directive
* @name umbraco.directives.directive:noDirtyCheck
* @restrict A
* @description Can be attached to form inputs to prevent them from setting the form as dirty (http://stackoverflow.com/questions/17089090/prevent-input-from-setting-form-dirty-angularjs)
**/
function noDirtyCheck() {
return {
restrict: 'A',
require: 'ngModel',
link: function (scope, elm, attrs, ctrl) {
elm.focus(function () {
ctrl.$pristine = false;
});
}
};
}
angular.module('umbraco.directives').directive("noDirtyCheck", noDirtyCheck);

30
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View File

@@ -41,11 +41,7 @@
<span ng-bind="bulkStatus" ng-show="isAnythingSelected()"></span>
</div>
<p ng-show="listViewResultSet.totalItems === 0">
<localize key="content_listViewNoItems">There are no items show in the list.</localize>
</p>
<table class="table table-striped" ng-show="listViewResultSet.totalItems > 0">
<table class="table table-striped">
<thead>
<tr>
<td style="width: 35px">
@@ -62,26 +58,38 @@
<td>
<form class="pull-right" novalidate>
<i class="icon-search"></i>
<input type="text" ng-model="options.filter" on-keyup="search()">
<input type="text" ng-model="options.filter" on-keyup="search()" no-dirty-check>
</form>
</td>
</tr>
</thead>
<tbody>
<tbody ng-show="listViewResultSet.totalItems === 0">
<tr>
<td colspan="5">
<p><localize key="content_listViewNoItems">There are no items show in the list.</localize></p>
</td>
</tr>
</tbody>
<tbody ng-show="listViewResultSet.totalItems > 0">
<tr ng-repeat="result in listViewResultSet.items"
ng-class="{selected:result.selected}">
<td>
<i class="icon {{result.icon}}" ng-class="getIcon(result)"></i>
<input type="checkbox" ng-model="result.selected"></td>
<input type="checkbox" ng-model="result.selected">
</td>
<td>
<a ng-class="{inactive: (entityType === 'content' && !result.published) || isTrashed}" href="#/{{entityType}}/{{entityType}}/edit/{{result.id}}">{{result.name}}</a></td>
<td>{{result.updateDate|date:'medium'}}
<a ng-class="{inactive: (entityType === 'content' && !result.published) || isTrashed}" href="#/{{entityType}}/{{entityType}}/edit/{{result.id}}">{{result.name}}</a>
</td>
<td>
{{result.updateDate|date:'medium'}}
<!--<<span class="label label-success">Publish</span>-->
</td>
<td>{{result.owner.name}}
<td>
{{result.owner.name}}
<!--<span class="label">Admin</span>-->
</td>
<td></td>