Merge branch 'master' into stable

HashBrownCMS · Feb 14, 2018 · 04dd938 · 04dd938
2 parents 13e62e1 + 5982a3c
commit 04dd938
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/github/server/Deployer.js b/plugins/github/server/Deployer.js
@@ -109,7 +109,8 @@ class GitHubDeployer extends HashBrown.Models.Deployer {
         // If using recursion, get tree instead
         if(recursions > 0) {
             path = this.extractSubPath(path);
-
+
+            // First get the entire tree
             return HashBrown.Helpers.RequestHelper.request('get', 'https://api.github.com/repos/' + this.repo + '/git/trees/' + (this.branch || 'gh-pages') + '?recursive=1&access_token=' + this.token)
             .then((data) => {
                 if(!data || !data.tree) { 
@@ -118,19 +119,36 @@ class GitHubDeployer extends HashBrown.Models.Deployer {
 
                 return Promise.resolve(data.tree);    
             })
+
+            // Then get each downloadable URL (necessary for private repos)
             .then((tree) => {
-                for(let i = tree.length -1; i >= 0; i--) {
-                    // Remove anything that's not a file or is not in the target path
-                    if(tree[i].mode !== '100644' || tree[i].path.indexOf(path) !== 0) {
-                        tree.splice(i, 1);
-                        continue;
-                    }
-
-                    // Replace API URL with static url
-                    tree[i].url = 'https://raw.githubusercontent.com/' + this.repo + '/' + (this.branch || 'gh-pages') + '/' + tree[i].path + '?sanitize=true';
-                }
+                let files = [];
+
+                let getNextFile = () => {
+                    let file = tree.pop();
+
+                    if(!file) { return Promise.resolve(files); }
+
+                    // Skip anything that's not a file or is not in the target path
+                    if(file.mode !== '100644' || file.path.indexOf(path) !== 0) { return getNextFile(); }
+
+                    return HashBrown.Helpers.RequestHelper.request('get', 'http://api.github.com/repos/' + this.repo + '/contents/' + file.path + '?ref=' + (this.branch || 'gh-pages') + '&access_token=' + this.token)
+                    .then((result) => {
+                        file.url = result.download_url;
+
+                        files.push(file);
+
+                        return getNextFile();
+                    })
+
+                    // The GET request might fail if the file is too big, but then just skip it
+                    .catch(() => {
+                        return getNextFile();
+
+                    });
+                };
 
-                return Promise.resolve(tree);
+                return getNextFile();
             }); 
         }
 

diff --git a/public/css/client.css b/public/css/client.css
@@ -2473,6 +2473,7 @@ h1, h2, h3, h4, h5, h6 {
     z-index: 5;
     background: transparent;
     right: 0;
+    height: 100%;
     top: 50%;
     transform: translateY(-50%);
     color: #e70d3b;

diff --git a/public/js/client.js b/public/js/client.js
@@ -6265,9 +6265,9 @@ var Modal = function (_Crisp$View) {
             return;
         }
 
-        return [_.h4({ class: 'modal__title' }, this.title), _.button({ class: 'modal__close fa fa-close' }).click(function () {
+        return [_.h4({ class: 'modal__title' }, this.title), _.if(!this.isBlocking, _.button({ class: 'modal__close fa fa-close' }).click(function () {
             _this4.close();
-        })];
+        }))];
     };
 
     /**
@@ -6289,7 +6289,7 @@ var Modal = function (_Crisp$View) {
             }, 50);
         }
 
-        return _.div({ class: 'modal' + (this.hasTransitionedIn ? ' in' : '') + (this.group ? ' ' + this.group : '') + (this.className ? ' modal--' + this.className : '') }, _.div({ class: 'modal__dialog' }, _.div({ class: 'widget--spinner embedded hidden' }, _.div({ class: 'widget--spinner__image fa fa-refresh' })), _.if(header, _.div({ class: 'modal__header' }, header)), _.if(body, _.div({ class: 'modal__body' }, body)), _.if(footer, _.div({ class: 'modal__footer' }, footer))));
+        return _.div({ class: 'modal' + (this.hasTransitionedIn ? ' in' : '') + (this.group ? ' ' + this.group : '') + (this.className ? ' modal--' + this.className : '') }, _.div({ class: 'modal__dialog' }, _.div({ class: 'widget--spinner embedded hidden' }, _.div({ class: 'widget--spinner__image fa fa-refresh' })), _.if(header, _.div({ class: 'modal__header' }, header)), _.if(body, _.div({ class: 'modal__body' }, body)), _.if(footer && !this.isBlocking, _.div({ class: 'modal__footer' }, footer))));
     };
 
     /**
@@ -21163,7 +21163,7 @@ module.exports = {
 	"_args": [
 		[
 			"[email protected]",
-			"/home/mrzapp/Development/Web/hashbrown-cms"
+			"/home/jz/Development/Web/hashbrown-cms"
 		]
 	],
 	"_development": true,
@@ -21189,7 +21189,7 @@ module.exports = {
 	],
 	"_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
 	"_spec": "6.4.0",
-	"_where": "/home/mrzapp/Development/Web/hashbrown-cms",
+	"_where": "/home/jz/Development/Web/hashbrown-cms",
 	"author": {
 		"name": "Fedor Indutny",
 		"email": "[email protected]"
@@ -32515,7 +32515,7 @@ var ContentEditor = function (_Crisp$View) {
                 }
 
                 // Construct remote URL
-                if (contentUrl !== '/' && contentUrl !== '//') {
+                if (contentUrl && contentUrl !== '//') {
                     remoteUrl = connection.url + contentUrl;
                     remoteUrl = remoteUrl.replace(/\/\//g, '/').replace(':/', '://');
                 } else {
@@ -33895,12 +33895,15 @@ var UIHelper = function () {
 
     UIHelper.messageModal = function messageModal(title, body, onClickOK, group) {
         var modal = new HashBrown.Views.Modals.Modal({
+            isBlocking: onClickOK === false,
             title: title,
             group: group,
             body: body
         });
 
-        modal.on('ok', onClickOK);
+        if (onClickOK) {
+            modal.on('ok', onClickOK);
+        }
 
         return modal;
     };
@@ -41515,7 +41518,20 @@ var MediaViewer = function (_Crisp$View) {
 
 
     MediaViewer.prototype.template = function template() {
-        var mediaSrc = (this.model.url || '/media/' + ProjectHelper.currentProject + '/' + ProjectHelper.currentEnvironment + '/' + this.model.id) + '?' + Date.now();
+        var mediaSrc = this.model.url;
+
+        if (!mediaSrc) {
+            mediaSrc = '/media/' + ProjectHelper.currentProject + '/' + ProjectHelper.currentEnvironment + '/' + this.model.id;
+        }
+
+        // Add timestamp
+        if (mediaSrc.indexOf('?') > -1) {
+            mediaSrc += '&';
+        } else {
+            mediaSrc += '?';
+        }
+
+        mediaSrc += 't=' + Date.now();
 
         return _.div({ class: 'editor editor--media' }, _.div({ class: 'editor__header' }, _.span({ class: 'editor__header__icon fa fa-file-image-o' }), _.h4({ class: 'editor__header__title' }, this.model.name, _.span({ class: 'editor__header__title__appendix' }, this.model.getContentTypeHeader()))), _.div({ class: 'editor__body' }, _.if(this.model.isImage(), _.img({ class: 'editor--media__preview', src: mediaSrc })), _.if(this.model.isVideo(), _.video({ class: 'editor--media__preview', controls: true }, _.source({ src: mediaSrc, type: this.model.getContentTypeHeader() })))));
     };

diff --git a/public/js/dashboard.js b/public/js/dashboard.js
@@ -6265,9 +6265,9 @@ var Modal = function (_Crisp$View) {
             return;
         }
 
-        return [_.h4({ class: 'modal__title' }, this.title), _.button({ class: 'modal__close fa fa-close' }).click(function () {
+        return [_.h4({ class: 'modal__title' }, this.title), _.if(!this.isBlocking, _.button({ class: 'modal__close fa fa-close' }).click(function () {
             _this4.close();
-        })];
+        }))];
     };
 
     /**
@@ -6289,7 +6289,7 @@ var Modal = function (_Crisp$View) {
             }, 50);
         }
 
-        return _.div({ class: 'modal' + (this.hasTransitionedIn ? ' in' : '') + (this.group ? ' ' + this.group : '') + (this.className ? ' modal--' + this.className : '') }, _.div({ class: 'modal__dialog' }, _.div({ class: 'widget--spinner embedded hidden' }, _.div({ class: 'widget--spinner__image fa fa-refresh' })), _.if(header, _.div({ class: 'modal__header' }, header)), _.if(body, _.div({ class: 'modal__body' }, body)), _.if(footer, _.div({ class: 'modal__footer' }, footer))));
+        return _.div({ class: 'modal' + (this.hasTransitionedIn ? ' in' : '') + (this.group ? ' ' + this.group : '') + (this.className ? ' modal--' + this.className : '') }, _.div({ class: 'modal__dialog' }, _.div({ class: 'widget--spinner embedded hidden' }, _.div({ class: 'widget--spinner__image fa fa-refresh' })), _.if(header, _.div({ class: 'modal__header' }, header)), _.if(body, _.div({ class: 'modal__body' }, body)), _.if(footer && !this.isBlocking, _.div({ class: 'modal__footer' }, footer))));
     };
 
     /**
@@ -20380,7 +20380,7 @@ module.exports = {
 	"_args": [
 		[
 			"[email protected]",
-			"/home/mrzapp/Development/Web/hashbrown-cms"
+			"/home/jz/Development/Web/hashbrown-cms"
 		]
 	],
 	"_development": true,
@@ -20406,7 +20406,7 @@ module.exports = {
 	],
 	"_resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
 	"_spec": "6.4.0",
-	"_where": "/home/mrzapp/Development/Web/hashbrown-cms",
+	"_where": "/home/jz/Development/Web/hashbrown-cms",
 	"author": {
 		"name": "Fedor Indutny",
 		"email": "[email protected]"
@@ -28980,12 +28980,15 @@ var UIHelper = function () {
 
     UIHelper.messageModal = function messageModal(title, body, onClickOK, group) {
         var modal = new HashBrown.Views.Modals.Modal({
+            isBlocking: onClickOK === false,
             title: title,
             group: group,
             body: body
         });
 
-        modal.on('ok', onClickOK);
+        if (onClickOK) {
+            modal.on('ok', onClickOK);
+        }
 
         return modal;
     };

diff --git a/src/Client/Helpers/UIHelper.js b/src/Client/Helpers/UIHelper.js
@@ -591,12 +591,15 @@ class UIHelper {
      */
     static messageModal(title, body, onClickOK, group) {
         let modal = new HashBrown.Views.Modals.Modal({
+            isBlocking: onClickOK === false,
             title: title,
             group: group,
             body: body
         });
 
-        modal.on('ok', onClickOK);
+        if(onClickOK) {
+            modal.on('ok', onClickOK);
+        }
 
         return modal;
     }

diff --git a/src/Client/Style/Views/Widgets/Dropdown.scss b/src/Client/Style/Views/Widgets/Dropdown.scss
@@ -324,6 +324,7 @@
         z-index: 5;
         background: transparent;
         right: 0;
+        height: 100%;
         top: 50%;
         transform: translateY(-50%);
         color: $primary;

diff --git a/src/Client/Views/Editors/ContentEditor.js b/src/Client/Views/Editors/ContentEditor.js
@@ -457,7 +457,7 @@ class ContentEditor extends Crisp.View {
                 }
 
                 // Construct remote URL
-                if(contentUrl !== '/' && contentUrl !== '//') {
+                if(contentUrl && contentUrl !== '//') {
                     remoteUrl = connection.url + contentUrl;
                     remoteUrl = remoteUrl.replace(/\/\//g, '/').replace(':/', '://');
 

diff --git a/src/Client/Views/Editors/MediaViewer.js b/src/Client/Views/Editors/MediaViewer.js
@@ -33,7 +33,20 @@ class MediaViewer extends Crisp.View {
      * Renders this editor
      */
     template() {
-        let mediaSrc = (this.model.url || '/media/' + ProjectHelper.currentProject + '/' + ProjectHelper.currentEnvironment + '/' + this.model.id) + '?' + Date.now();
+        let mediaSrc = this.model.url;
+
+        if(!mediaSrc) {
+            mediaSrc = '/media/' + ProjectHelper.currentProject + '/' + ProjectHelper.currentEnvironment + '/' + this.model.id;
+        }
+
+        // Add timestamp
+        if(mediaSrc.indexOf('?') > -1) {
+            mediaSrc += '&';            
+        } else {
+            mediaSrc += '?';
+        }
+
+        mediaSrc += 't=' + Date.now();
 
         return _.div({class: 'editor editor--media'},
             _.div({class: 'editor__header'},

diff --git a/src/Client/Views/Modals/Modal.js b/src/Client/Views/Modals/Modal.js
@@ -33,7 +33,7 @@ class Modal extends Crisp.View {
         if(this.autoFetch !== false) {
             this.fetch();
         }
-        
+
         document.body.appendChild(this.element);
     }
 
@@ -110,8 +110,10 @@ class Modal extends Crisp.View {
 
         return [
             _.h4({class: 'modal__title'}, this.title),
-            _.button({class: 'modal__close fa fa-close'})
-                .click(() => { this.close(); })
+            _.if(!this.isBlocking,
+                _.button({class: 'modal__close fa fa-close'})
+                    .click(() => { this.close(); })
+            )
         ];
     }
 
@@ -145,7 +147,7 @@ class Modal extends Crisp.View {
                         body 
                     )
                 ),
-                _.if(footer,
+                _.if(footer && !this.isBlocking,
                     _.div({class: 'modal__footer'},
                         footer
                     )

diff --git a/src/Server/Controllers/PluginController.js b/src/Server/Controllers/PluginController.js
@@ -30,6 +30,7 @@ class PluginController extends Controller {
                 compiledJs += FileSystem.readFileSync(path, 'utf8');
             }
 
+            res.set('Content-Type', 'text/javascript');
             res.send(compiledJs);
         });
     }
@@ -45,6 +46,7 @@ class PluginController extends Controller {
                 compiledCss += FileSystem.readFileSync(path, 'utf8');
             }
 
+            res.set('Content-Type', 'text/css');
             res.send(compiledCss);
         });
     }