X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=frontend%2Fjs%2Fapp.js;h=d99a840214074979ceb049cad64ea5d42517ddb3;hb=34adfa8518ba0b57d1837db1847a13215f31a83c;hp=0a6ada16c788cae357568b8625cea425993f99ff;hpb=996e13b351ddcc106e4700adc6257d0815e2cd23;p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git

diff --git a/frontend/js/app.js b/frontend/js/app.js
index 0a6ada1..d99a840 100644
--- a/frontend/js/app.js
+++ b/frontend/js/app.js
@@ -23,14 +23,14 @@ function asyncForEach(items, handler, callback) {
     })();
 }
 
-function getProfile(accessToken, callback) {
+function initWithToken(accessToken) {
     superagent.get('/api/profile').query({ access_token: accessToken }).end(function (error, result) {
         app.ready = true;
 
-        if (error && !error.response) return callback(error);
+        if (error && !error.response) return console.error(error);
         if (result.statusCode !== 200) {
             delete localStorage.accessToken;
-            return callback('Invalid access token');
+            return;
         }
 
         localStorage.accessToken = accessToken;
@@ -42,7 +42,7 @@ function getProfile(accessToken, callback) {
 
             app.folderListingEnabled = !!result.body.folderListingEnabled;
 
-            callback();
+            loadDirectory(decode(window.location.hash.slice(1)));
         });
     });
 }
@@ -116,6 +116,8 @@ function loadDirectory(filePath) {
         app.entries = result.body.entries.map(function (entry) {
             entry.previewUrl = getPreviewUrl(entry, filePath);
             entry.extension = getExtension(entry);
+            entry.rename = false;
+            entry.filePathNew = entry.filePath;
             return entry;
         });
         app.path = filePath;
@@ -132,6 +134,9 @@ function loadDirectory(filePath) {
 }
 
 function open(row, event, column) {
+    // ignore item open on row clicks if we are renaming this entry
+    if (row.rename) return;
+
     var path = sanitize(app.path + '/' + row.filePath);
 
     if (row.isDirectory) {
@@ -171,7 +176,8 @@ function uploadFiles(files) {
             if (!(event.target instanceof XMLHttpRequestUpload)) return;
 
             app.uploadStatus.done = finishedUploadSize + event.loaded;
-            app.uploadStatus.percentDone = Math.round(app.uploadStatus.done / app.uploadStatus.size * 100);
+            var tmp = Math.round(app.uploadStatus.done / app.uploadStatus.size * 100);
+            app.uploadStatus.percentDone = tmp > 100 ? 100 : tmp;
         }).end(function (error, result) {
             if (result && result.statusCode === 401) return logout();
             if (result && result.statusCode !== 201) return callback('Error uploading file: ', result.statusCode);
@@ -253,6 +259,7 @@ var app = new Vue({
     data: {
         ready: false,
         busy: false,
+        origin: window.location.origin,
         uploadStatus: {
             busy: false,
             count: 0,
@@ -285,11 +292,7 @@ var app = new Vue({
                 if (error && !result) return that.$message.error(error.message);
                 if (result.statusCode === 401) return that.$message.error('Wrong username or password');
 
-                getProfile(result.body.accessToken, function (error) {
-                    if (error) return console.error(error);
-
-                    loadDirectory(window.location.hash.slice(1));
-                });
+                initWithToken(result.body.accessToken);
             });
         },
         onOptionsMenu: function (command) {
@@ -357,22 +360,42 @@ var app = new Vue({
                 });
             }).catch(function () {});
         },
-        onRename: function (entry) {
+        onRename: function (entry, scope) {
+            if (entry.rename) return entry.rename = false;
+
+            entry.rename = true;
+
+            Vue.nextTick(function () {
+                var elem = document.getElementById('filePathRenameInputId-' + scope.$index);
+                elem.focus();
+
+                if (typeof elem.selectionStart != "undefined") {
+                    elem.selectionStart = 0;
+                    elem.selectionEnd = entry.filePath.lastIndexOf('.');
+                }
+            });
+        },
+        onRenameEnd: function (entry) {
+            entry.rename = false;
+            entry.filePathNew = entry.filePath;
+        },
+        onRenameSubmit: function (entry) {
             var that = this;
 
-            var title = 'Rename ' + entry.filePath;
-            this.$prompt('', title, { confirmButtonText: 'Yes', cancelButtonText: 'No', inputPlaceholder: 'new filename', inputValue: entry.filePath }).then(function (data) {
-                var path = encode(sanitize(that.path + '/' + entry.filePath));
-                var newFilePath = sanitize(that.path + '/' + data.value);
+            entry.rename = false;
 
-                superagent.put('/api/files' + path).query({ access_token: localStorage.accessToken }).send({ newFilePath: newFilePath }).end(function (error, result) {
-                    if (result && result.statusCode === 401) return logout();
-                    if (result && result.statusCode !== 200) return that.$message.error('Error renaming file: ' + result.statusCode);
-                    if (error) return that.$message.error(error.message);
+            if (entry.filePathNew === entry.filePath) return;
 
-                    refresh();
-                });
-            }).catch(function () {});
+            var path = encode(sanitize(this.path + '/' + entry.filePath));
+            var newFilePath = sanitize(this.path + '/' + entry.filePathNew);
+
+            superagent.put('/api/files' + path).query({ access_token: localStorage.accessToken }).send({ newFilePath: newFilePath }).end(function (error, result) {
+                if (result && result.statusCode === 401) return logout();
+                if (result && result.statusCode !== 200) return that.$message.error('Error renaming file: ' + result.statusCode);
+                if (error) return that.$message.error(error.message);
+
+                entry.filePath = entry.filePathNew;
+            });
         },
         onNewFolder: function () {
             var that = this;
@@ -425,14 +448,10 @@ var app = new Vue({
     }
 });
 
-getProfile(localStorage.accessToken, function (error) {
-    if (error) return console.error(error);
-
-    loadDirectory(window.location.hash.slice(1));
-});
+initWithToken(localStorage.accessToken);
 
 $(window).on('hashchange', function () {
-    loadDirectory(window.location.hash.slice(1));
+    loadDirectory(decode(window.location.hash.slice(1)));
 });
 
 })();