Merge branch 'stable' into p3

This commit is contained in:
Usman Nasir
2019-12-30 15:38:58 +05:00
8 changed files with 111 additions and 6 deletions

View File

@@ -25,6 +25,10 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) {
fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) {
$('form').submit(function (e) {
e.preventDefault();
});
$(document.body).click(function () {
rightClickNode.style.display = "none";
});
@@ -861,6 +865,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
$('#showCreateFolder').modal('show');
};
$scope.createFolderEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.htmlEditorLoading = false;
$scope.createNewFolder();
}
};
$scope.createNewFolder = function () {
$scope.errorMessageFolder = true;
@@ -921,6 +933,15 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
$('#showCreateFile').modal('show');
};
$scope.createFileEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.htmlEditorLoading = false;
$scope.createNewFile();
}
};
$scope.createNewFile = function () {
var completePathForFile = $scope.currentPath + "/" + $scope.newFileName;
@@ -1356,6 +1377,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
$scope.newFileName = "";
};
$scope.renameEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.htmlEditorLoading = false;
$scope.renameFile();
}
};
$scope.renameFile = function () {

View File

@@ -328,7 +328,7 @@
<form action="/">
<div class="form-group">
<label>{% trans "New Folder Name" %}</label>
<input ng-model="newFolderName" type="text" class="form-control" >
<input ng-keypress="createFolderEnter($event)" ng-model="newFolderName" type="text" class="form-control" >
<small class="form-text text-muted">{% trans "Folder will be created in your current directory" %}</small>
</div>
<button type="button" ng-click="createNewFolder()" class="btn btn-primary">{% trans "Create Folder" %}</button>
@@ -372,7 +372,7 @@
<form action="/">
<div class="form-group">
<label>{% trans "New File Name" %}</label>
<input ng-model="newFileName" type="text" class="form-control" >
<input ng-keypress="createFileEnter($event)" ng-model="newFileName" type="text" class="form-control" >
<small class="form-text text-muted">{% trans "File will be created in your current directory, if it already exists it will not overwirte." %}</small>
</div>
<button type="button" ng-click="createNewFile()" class="btn btn-primary">{% trans "Create File" %}</button>
@@ -578,7 +578,7 @@
<form>
<div class="form-group">
<label>{% trans "New Name" %}</label>
<input ng-model="newFileName" type="text" class="form-control">
<input ng-keypress="renameEnter($event)" ng-model="newFileName" type="text" class="form-control">
<small class="form-text text-muted">{% trans "Enter new name of file!" %}</small>
</div>
</form>