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

src/commands/index.js

@@ -100,10 +100,10 @@ export default () => {
       if (ppfx) c.stylePrefix = ppfx + c.stylePrefix;
 
       // Load commands passed via configuration
-      for (let k in c.defaults) {
+      Object.keys(c.defaults).forEach(k => {
         const obj = c.defaults[k];
         if (obj.id) this.add(obj.id, obj);
-      }
+      });
 
       defaultCommands['tlb-delete'] = {
         run(ed) {

src/dom_components/model/Components.js

@@ -22,11 +22,17 @@ export default Backbone.Collection.extend({
   },
 
   removeChildren(removed, coll, opts = {}) {
+    // Removing a parent component can cause this function
+    // to be called with an already removed child element
+    if (!removed) {
+      return;
+    }
+
     const { domc, em } = this;
     const allByID = domc ? domc.allById() : {};
 
     if (!opts.temporary) {
-      // Remove the component from the gloabl list
+      // Remove the component from the global list
       const id = removed.getId();
       const sels = em.get('SelectorManager').getAll();
       const rules = em.get('CssComposer').getAll();

src/i18n/locale/nl.js

@@ -5,7 +5,7 @@ export default {
     addButton: 'Afbeelding toevoegen',
     inputPlh: 'http://path/to/the/image.jpg',
     modalTitle: 'Selecteer afbeelding',
-    uploadTitle: 'Drop files here or click to upload'
+    uploadTitle: 'Zet bestanden hier neer of klik om te uploaden'
   },
   // Here just as a reference, GrapesJS core doesn't contain any block,
   // so this should be omitted from other local files