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

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Shannon
2015-09-03 16:49:14 +02:00
parent 6c3b63cf55 6b195587c1
commit 1fdb813d1d
55 changed files with 791 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
View File

@@ -9,7 +9,7 @@
*/
function LegacyController($scope, $routeParams, $element) {
var url = decodeURIComponent($routeParams.url.toLowerCase().replace(/javascript\:/g, ""));
var url = decodeURIComponent($routeParams.url.replace(/javascript\:/gi, ""));
//split into path and query
var urlParts = url.split("?");
var extIndex = urlParts[0].lastIndexOf(".");

2
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemgmt.controller.js
View File

@@ -43,7 +43,7 @@ function examineMgmtController($scope, umbRequestHelper, $log, $http, $q, $timeo
umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("examineMgmtBaseUrl", "GetSearchResults", {
searcherName: searcher.name,
query: searcher.searchText,
query: encodeURIComponent(searcher.searchText),
queryType: searcher.searchType
})),
'Failed to search')

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
View File

@@ -21,7 +21,7 @@ angular.module("umbraco")
};
$scope.percentage = function(spans){
return ((spans / $scope.columns) * 100).toFixed(1);
return ((spans / $scope.columns) * 100).toFixed(8);
};
$scope.toggleCollection = function(collection, toggle){

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
View File

@@ -19,7 +19,7 @@ function RowConfigController($scope) {
};
$scope.percentage = function(spans) {
return ((spans / $scope.columns) * 100).toFixed(1);
return ((spans / $scope.columns) * 100).toFixed(8);
};
$scope.toggleCollection = function(collection, toggle) {

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
View File

@@ -14,7 +14,8 @@ angular.module("umbraco")
$scope.control.value = {
focalPoint: data.focalPoint,
id: data.id,
image: data.image
image: data.image,
altText: data.altText
};
$scope.setUrl();

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -424,7 +424,7 @@ angular.module("umbraco")
};
$scope.percentage = function (spans) {
return ((spans / $scope.model.config.items.columns) * 100).toFixed(1);
return ((spans / $scope.model.config.items.columns) * 100).toFixed(8);
};

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
View File

@@ -161,7 +161,7 @@ angular.module("umbraco")
};
$scope.percentage = function(spans){
return ((spans / $scope.model.value.columns) * 100).toFixed(1);
return ((spans / $scope.model.value.columns) * 100).toFixed(8);
};
$scope.zeroWidthFilter = function (cell) {