From 3c751d68f2c42d0786f6a1649785b20afdef5845 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 14 Oct 2014 02:00:50 +0200 Subject: [PATCH] Fixed text modules. --- .../app/controllers/widget/text_module.js.coffee | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/text_module.js.coffee b/app/assets/javascripts/app/controllers/widget/text_module.js.coffee index f2e16cc3e..909b880fd 100644 --- a/app/assets/javascripts/app/controllers/widget/text_module.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/text_module.js.coffee @@ -20,24 +20,25 @@ class App.WidgetTextModule extends App.Controller reload: (data) => return if !data + @data = data @update() update: => allRaw = App.TextModule.all() all = [] - ui = @data || @ + data = @data || @ for item in allRaw if item.active is true attributes = item.attributes() attributes.content = attributes.content.replace( /<%=\s{0,2}(.+?)\s{0,2}%>/g, ( index, key ) -> - key = key.replace( /@/g, 'ui.data.' ) + key = key.replace( /@/g, 'data.' ) varString = "#{key}" + '' -# console.log( "tag replacement env: ", ui.data) + #console.log( "tag replacement env: ", data) try -# console.log( "tag replacement: " + key, varString ) + #console.log( "tag replacement: " + key, varString ) key = eval (varString) catch error -# console.log( "tag replacement error: " + error ) + #console.log( "tag replacement error: " + error ) key = '' return key )