Skip to content

Commit 1fc0d6f

Browse files
committed
changed delete to remove in order to dont use reserved word, other changes related #31
1 parent ca0b581 commit 1fc0d6f

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

assets/js/config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
edit: true,
2424
changePermissions: true,
2525
compress: true,
26+
compressChooseName: true,
2627
extract: true,
2728
download: true,
2829
preview: true,
29-
delete: true
30+
remove: true
3031
},
3132

3233
enablePermissionsRecursive: true,

assets/templates/item-context-menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<li data-ng-show="config.allowedActions.download && !temp.isFolder()"><a href="" tabindex="-1" data-ng-click="temp.download()"><i class="glyphicon glyphicon-download"></i> {{'download' | translate}}</a></li>
1010
<li data-ng-show="config.allowedActions.preview && temp.isImage()"><a href="" tabindex="-1" data-ng-click="temp.preview()"><i class="glyphicon glyphicon-picture"></i> {{'view_item' | translate}}</a></li>
1111
<li class="divider"></li>
12-
<li data-ng-show="config.allowedActions.delete"><a href="" tabindex="-1" data-toggle="modal" data-target="#delete"><i class="glyphicon glyphicon-trash"></i> {{'remove' | translate}}</a></li>
12+
<li data-ng-show="config.allowedActions.remove"><a href="" tabindex="-1" data-toggle="modal" data-target="#delete"><i class="glyphicon glyphicon-trash"></i> {{'remove' | translate}}</a></li>
1313
</ul>
1414
</div>

assets/templates/item-toolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<button class="btn btn-sm btn-default" data-ng-show="config.allowedActions.preview && item.isImage()" data-ng-click="item.preview()" title="{{'view_item' | translate}}">
2424
<i class="glyphicon glyphicon-picture"></i>
2525
</button>
26-
<button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#delete" ng-show="config.allowedActions.delete" data-ng-click="touch(item)" title="{{'remove' | translate}}">
26+
<button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#delete" ng-show="config.allowedActions.remove" data-ng-click="touch(item)" title="{{'remove' | translate}}">
2727
<i class="glyphicon glyphicon-trash"></i>
2828
</button>
2929
</div>

assets/templates/modals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ <h4 class="modal-title">{{'compress' | translate}}</h4>
9292
<div class="label label-success error-msg">{{'compression_started' | translate}}</div>
9393
</div>
9494
<div ng-hide="temp.success">
95-
<div ng-hide="config.allowedActions.compress">
95+
<div ng-hide="config.allowedActions.compressChooseName">
9696
{{'sure_to_start_compression_with' | translate}} <b>{{temp.model.name}}</b> ?
9797
</div>
98-
<div ng-show="config.allowedActions.compress">
98+
<div ng-show="config.allowedActions.compressChooseName">
9999
<label class="radio">{{'enter_folder_name_for_compression' | translate}} <b>{{fileNavigator.currentPath.join('/')}}/{{temp.model.name}}</b></label>
100100
<input class="form-control" data-ng-model="temp.tempModel.name" autofocus="autofocus">
101101
</div>

dist/angular-filemanager.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)