From 24368fef60e0019c0612d944c181c303afdb9c96 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 24 Apr 2016 13:01:01 +0800 Subject: [PATCH] Metamaps.JIT no more erb extension --- .../javascripts/src/{Metamaps.JIT.js.erb => Metamaps.JIT.js} | 4 ++-- app/assets/javascripts/src/Metamaps.js.erb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename app/assets/javascripts/src/{Metamaps.JIT.js.erb => Metamaps.JIT.js} (99%) diff --git a/app/assets/javascripts/src/Metamaps.JIT.js.erb b/app/assets/javascripts/src/Metamaps.JIT.js similarity index 99% rename from app/assets/javascripts/src/Metamaps.JIT.js.erb rename to app/assets/javascripts/src/Metamaps.JIT.js index 4b72b714..01b321f7 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js.erb +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -29,10 +29,10 @@ Metamaps.JIT = { $('.takeScreenshot').click(Metamaps.Map.exportImage) self.topicDescImage = new Image() - self.topicDescImage.src = '<%= asset_path('topic_description_signifier.png') %>' + self.topicDescImage.src = Metamaps.Erb['topic_description_signifier.png'] self.topicLinkImage = new Image() - self.topicLinkImage.src = '<%= asset_path('topic_link_signifier.png') %>' + self.topicLinkImage.src = Metamaps.Erb['topic_link_signifier.png'] }, /** * convert our topic JSON into something JIT can use diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb index 7d35e54a..666ad66d 100644 --- a/app/assets/javascripts/src/Metamaps.js.erb +++ b/app/assets/javascripts/src/Metamaps.js.erb @@ -25,6 +25,8 @@ Metamaps.Erb['REALTIME_SERVER'] = '<%= ENV['REALTIME_SERVER'] %>' Metamaps.Erb['junto_spinner_darkgrey.gif'] = '<%= asset_path('junto_spinner_darkgrey.gif') %>' Metamaps.Erb['user.png'] = '<%= asset_path('user.png') %>' Metamaps.Erb['icons/wildcard.png'] = '<%= asset_path('icons/wildcard.png') %>' +Metamaps.Erb['topic_description_signifier.png'] = '<%= asset_path('topic_description_signifier.png') %>' +Metamaps.Erb['topic_link_signifier.png'] = '<%= asset_path('topic_link_signifier.png') %>' Metamaps.Settings = { embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages