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

Merge branch '7.1.5_U4-5316' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.1.5_U4-5316

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
This commit is contained in:
Shannon
2014-08-08 12:29:17 -06:00
parent fa4a268556
commit 247b5b648d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
View File

@@ -98,8 +98,9 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
</div>
<div class="umb-panel-body with-footer">
<div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader"
ng-hide="active() == 0"></div>
<div style="overflow: hidden; margin-left: -20px; margin-right: -20px;">
<div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader" ng-hide="active() == 0"></div>
</div>
<umb-photo-folder
min-height="105"
min-width="150"

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
View File

@@ -8,7 +8,7 @@
assetsService.load([
//"lib/spectrum/tinycolor.js",
"lib/spectrum/spectrum.js"
"lib/spectrum/spectrum.js"
]).then(function () {
var elem = $element.find("input");
elem.spectrum({
@@ -68,7 +68,10 @@
});
if (!exists) {
$scope.model.value.push({ value: $scope.newColor });
$scope.newColor = defaultColor;
//$scope.newColor = defaultColor;
// set colorpicker to default color
//var elem = $element.find("input");
//elem.spectrum("set", $scope.newColor);
$scope.hasError = false;
return;
}