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

media editor tree sync

Browse Source
This commit is contained in:
perploug
2013-11-05 11:18:23 +01:00
parent 7e36a6b6e1
commit 4be6e21257
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
View File

@@ -7,9 +7,8 @@ data-file-upload-progress=""
data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
<span class="btn fileinput-button umb-upload-button-big"
ng-class="{disabled: disabled}" ng-show="touchDevice || images.length === 0">
<span class="fileinput-button umb-upload-button-big"
ng-class="{disabled: disabled}">
<i class="icon icon-page-up"></i>
<p>Click to upload</p>
<input type="file" name="files[]" multiple ng-disabled="disabled">

3
src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
View File

@@ -29,7 +29,7 @@ function mediaEditController($scope, $routeParams, mediaResource, navigationServ
// after the redirect, so we will bind all subscriptions which will show the server validation errors
// if there are any and then clear them so the collection no longer persists them.
serverValidationManager.executeAndClearAllSubscriptions();
navigationService.syncPath(data.path, true);
});
}
@@ -61,6 +61,7 @@ function mediaEditController($scope, $routeParams, mediaResource, navigationServ
rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
});
navigationService.syncPath(data.path, true);
}, function(err) {
contentEditingHelper.handleSaveError({

16
src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
View File

@@ -7,14 +7,13 @@ data-file-upload-progress=""
ng-hide="creating"
data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
<span class="fileinput-button umb-upload-button-big"
ng-show="touchDevice || images.length === 0"
<span class="fileinput-button umb-upload-button-big"
ng-hide="dropping"
ng-class="{disabled: disabled}">
<i class="icon icon-page-up"></i>
<p>Click to upload</p>
<input type="file" name="files[]" multiple ng-disabled="disabled">
</span>
<i class="icon icon-page-up"></i>
<p>Click to upload</p>
<input type="file" name="files[]" multiple ng-disabled="disabled">
</span>
<umb-upload-dropzone dropping="dropping" files="filesUploading">
</umb-upload-dropzone>
@@ -23,6 +22,7 @@ data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
min-height="220"
min-width="220"
on-click="clickHandler"
ng-model="images"
/>
ng-model="images"/>
</form>