Merge branch 'dev' of https://github.com/artf/grapesjs into dev

src/asset_manager/config/config.js

@@ -73,6 +73,9 @@ module.exports = {
   // }
   uploadFile: '',
 
+  // In the absence of 'uploadFile' or 'upload' assets will be embedded as Base64
+  embedAsBase64: 1,
+
   // Handle the image url submit from the built-in 'Add image' form
   // @example
   // handleAdd: (textFromInput) => {

src/asset_manager/view/FileUploader.js

@@ -32,7 +32,7 @@ module.exports = Backbone.View.extend(
 
       if (uploadFile) {
         this.uploadFile = uploadFile.bind(this);
-      } else if (c.embedAsBase64) {
+      } else if (!c.upload && c.embedAsBase64) {
         this.uploadFile = this.constructor.embedAsBase64;
       }
 

src/commands/view/SelectComponent.js

@@ -69,7 +69,7 @@ module.exports = {
 
     if (!model) {
       let parent = $el.parent();
-      while (!model && parent) {
+      while (!model && parent.length > 0) {
         model = parent.data('model');
         parent = parent.parent();
       }
@@ -182,7 +182,7 @@ module.exports = {
 
     if (!model) {
       let parent = $el.parent();
-      while (!model && parent) {
+      while (!model && parent.length > 0) {
         model = parent.data('model');
         parent = parent.parent();
       }