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

src/canvas/view/CanvasView.js

@@ -299,7 +299,7 @@ export default Backbone.View.extend({
     const scriptFn = model.getScriptString();
     const scriptFnStr = model.get('script-props')
       ? scriptFn
-      : `function(){${scriptFn};}`;
+      : `function(){\n${scriptFn}\n;}`;
     const scriptProps = JSON.stringify(model.__getScriptProps());
     script.innerHTML = `
       setTimeout(function() {

src/code_manager/model/JsGenerator.js

@@ -69,7 +69,7 @@ export default Backbone.Model.extend({
         code += `
           var items = document.querySelectorAll('${ids}');
           for (var i = 0, len = items.length; i < len; i++) {
-            (function(){${mapType.code}}.bind(items[i]))();
+            (function(){\n${mapType.code}\n}.bind(items[i]))();
           }`;
       }
     }