@widgetic/editor 3.10.48 → 3.10.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widgetic/editor",
-  "version": "3.10.48",
+  "version": "3.10.50",
   "scripts": {
     "start": "webpack --config webpack.config.js --watch --progress",
     "build": "webpack --config webpack.config.js",
@@ -9,7 +9,8 @@
     "version": "grunt release && git add -A lib",
     "postversion": "git push && npm publish",
     "genssl": "openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout key.pem -out cert.pem -subj /CN=localhost",
-    "server": "http-server -S -p 8083"
+    "server": "http-server -S -p 8083",
+    "deploy": "cd ./lib && rsync * root@zeus.widgetic.com:/opt/widgetic_editor/lib"
   },
   "devDependencies": {
     "@widgetic/spine": "^2.0.3",

package/src/core/services/uploads.js

@@ -81,44 +81,57 @@ export default class UploadService extends EventsMixin(Service) {
   }
 
   upload(uploadFile) {
-    // console.log("upload file:", uploadFile);
-
-    this.files.push(
-      new File({
-        state: 'new',
-        size: uploadFile.size,
-        name: uploadFile.name,
-        type: parseType(uploadFile.type),
-        // lastModified: uploadFile.lastModified,
-        uploadFile,
-      })
-    );
+    // console.log("on upload file:", uploadFile);
+
+    // create a new File instance from the uploadFile 
+    let file = new File({
+      state: 'new',
+      size: uploadFile.size,
+      name: uploadFile.name,
+      type: parseType(uploadFile.type),
+      lastModified: Date.now(),
+      uploadFile,
+    });
+    console.log("on upload file:", file);
+
+    // push it to the files array
+    this.files.push(file);
+
+    // increase used quota
     this.used += uploadFile.size;
+
+    // broadcast the update of the files array
     this._broadcast.update();
   }
 
   uploadComplete(uploadFile, instanceId) {
     // console.log("uploadComplete file:", uploadFile);
+
     if (uploadFile.status === 'error') return;
 
-    // read metadata(id here) from the file that's on the server
+    // read metadata from the file that's on the server
     const response = JSON.parse(uploadFile.xhr.response);
-    // console.log("uploadComplete file on the server:", response.files.data[0])
-    const id = response.files.data[0].id;
+    // console.log("uploadComplete server response:", response);
+    
+    // read file from the response
+    let serverFile = response.files.data[0];
+    // console.log("uploadComplete file on the server:", serverFile);
 
     // read quota from response
     // this.quota = response.quota.max;
     this.used = response.quota.used;
 
+    // update the file in the files array with the data from the server
     this._update(uploadFile, f => {
       f.state = 'complete';
-      f.id = id;
-      f.path = response.files.data[0].path;
+      f.id = serverFile.id;
+      f.path = serverFile.path;
       f.url = response.hostUrl + f.path;
-      // f.lastModified = uploadFile.lastModified;
+      f.lastModified = serverFile.lastModified;
     });
 
-    this._broadcast.complete([this.get(id), instanceId]);
+    // broadcast the completion of the upload based on the fileId and instanceId
+    this._broadcast.complete([this.get(serverFile.id), instanceId]);
   }
 
   accept(file, done) {
@@ -162,10 +175,13 @@ export default class UploadService extends EventsMixin(Service) {
   }
 
   _update(file, transform) {
+    // apply the transform function to the file in the array
     this.files = this.files.map(f => {
       if (f.uploadFile === file) transform(f);
       return f;
     });
+
+    // broadcast the update of the files array
     this._broadcast.update();
   }
 

package/src/editor/content/browser/service.html

@@ -7,7 +7,7 @@ export default {
   },
 
   computed: {
-    instance: service => Container[service],
+    instance: service => Container[service], // get the service instance
   },
 
   oncreate() {

package/src/editor/content/browser/upload.html

@@ -182,7 +182,7 @@
 import Dropzone from './dropzone.html';
 import ScrollPane from './scroll-pane.html';
 import File from './file.html';
-import Service from './service.html';
+import Service from './service.html'; // actually imports services/uploads.js
 
 let instanceId = 0;
 
@@ -233,7 +233,7 @@ export default {
 
     // on selecting a file square
     toggle(file) {
-      console.log("on toggle file:", file);
+      // console.log("on toggle file:", file);
 
       if (file.error) {
         this.Uploads.remove(file);
@@ -251,7 +251,7 @@ export default {
     },
 
     refresh(ev) {
-      console.log("refreshing...");
+      // console.log("refreshing...");
       if (ev) ev.preventDefault();
 
       return this.Uploads.getFiles(this.get('filetypes'))
@@ -264,13 +264,40 @@ export default {
           //   if(!a.id.indexOf) return -1;
           //   let noIdA = a.id.substr(a.id.indexOf('_t')+2, 4);
           //   let noIdB = b.id.substr(a.id.indexOf('_t')+2, 4);
-          //   // console.log("noIdA & noIdB: ", noIdA, noIdB, (noIdA >= noIdB));
+          //   // console.log("noIdA & noIdB: ", noIdA, noIdB, (noIdA - noIdB));
           //   return noIdA - noIdB;
           // });
           // console.log("uploadedFiles after sort: ", files);
 
-          // sort files by last modified date
-          files = files.sort((a, b) => { return a.lastModified - b.lastModified; });
+          // sort files by last modified(uploadTime) date
+          files = files.sort((a, b) => {
+
+            //  read a lastModified timestamp
+            let x = a.lastModified;
+
+            // read the lastModified date from the id
+            if(!x) x = a.id.substring(a.id.indexOf('_u')+3);
+
+            // if still not available then set it to 0
+            if(!x) x = 0;
+            // a.lastModified = x;
+
+
+            // read b lastModified timestamp
+            let y = b.lastModified;
+
+            // read the lastModified date from the id
+            if(!y) y = b.id.substring(b.id.indexOf('_u')+3);
+
+            // if still not available then set it to 0
+            if(!y) y = 0;
+            // b.lastModified = y;
+
+
+            // console.log("x & y: ", a.lastModified, x, b.lastModified, y);
+
+            return x - y; 
+          });
           console.log("uploadedFiles after sort: ", files);
 
           return this.set({ files })
@@ -332,12 +359,12 @@ export default {
      */
 
     _onDropZoneNewUpload(event) {
-      console.log("on DropZone New Upload:", event);
+      // console.log("on DropZone New Upload:", event);
       this.refs.scrollPane && this.refs.scrollPane.scrollBottom();
     },
 
     _onDropZoneUpload(event) {
-      console.log("on DropZone Upload:", event);
+      // console.log("on DropZone Upload:", event);
       this.toggle( event );
     },
 
@@ -346,19 +373,19 @@ export default {
      */
 
     _onUpdate(event) {
-      console.log("on Update Content:", event);
+      // console.log("on Update Content:", event);
 
       // re-load uploaded files
       this.refresh();
     },
 
     _onUploadComplete([file, instanceId]) {
-      console.log("on Upload Complete:", file, instanceId);
+      // console.log("on Upload Complete:", file, instanceId);
 
       // toggle the file only if it's upload originated from this instance
       if (instanceId === this.get('instanceId')) this._toggleSelect(file, { afterUpload: true });
 
-      // sort files by upload date
+      // reload files by upload date
       // this.refresh();
     },
   },