From bc456624c801ff8cb928ebfffdbd2161ccf8cb90 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 13 Jul 2017 14:46:07 +0200 Subject: [PATCH] Update build script in JS generator --- src/code_manager/model/JsGenerator.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/code_manager/model/JsGenerator.js b/src/code_manager/model/JsGenerator.js index 7823742fd..ac8a0d530 100644 --- a/src/code_manager/model/JsGenerator.js +++ b/src/code_manager/model/JsGenerator.js @@ -14,9 +14,6 @@ module.exports = Backbone.Model.extend({ var attr = model.get('attributes'); attr = _.extend({}, attr, {id}); model.set('attributes', attr); - - //var scrStr = 'function(){' + script + '}'; - //scrStr = typeof script == 'function' ? script.toString() : scrStr; var scrStr = model.getScriptString(); // If the script was updated, I'll put its code in a separate container @@ -49,10 +46,11 @@ module.exports = Backbone.Model.extend({ for(var type in this.mapJs) { var mapType = this.mapJs[type]; var ids = '#' + mapType.ids.join(', #'); - code += 'var items = document.querySelectorAll("'+ids+'");' + - 'for (var i = 0, len = items.length; i < len; i++) {'+ - '(' + mapType.code + '.bind(items[i]))();' + - '}'; + code += ` + var items = document.querySelectorAll('${ids}'); + for (var i = 0, len = items.length; i < len; i++) { + (function(){${mapType.code}}.bind(items[i]))(); + }`; }