diff --git a/app/assets/javascripts/src/Metamaps.Account.js.erb b/app/assets/javascripts/src/Metamaps.Account.js similarity index 96% rename from app/assets/javascripts/src/Metamaps.Account.js.erb rename to app/assets/javascripts/src/Metamaps.Account.js index 89f8cfca..20a3ea54 100644 --- a/app/assets/javascripts/src/Metamaps.Account.js.erb +++ b/app/assets/javascripts/src/Metamaps.Account.js @@ -3,7 +3,8 @@ /* * Metamaps.Account.js.erb * - * Dependencies: none! + * Dependencies: + * - Metamaps.Erb */ Metamaps.Account = { @@ -95,7 +96,7 @@ Metamaps.Account = { var self = Metamaps.Account $('.userImageDiv canvas').remove() - $('.userImageDiv img').attr('src', '<%= asset_path('user.png') %>').show() + $('.userImageDiv img').attr('src', Metamaps.Erb['user.png']) %>').show() $('.userImageMenu').hide() var input = $('#user_image') diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb b/app/assets/javascripts/src/Metamaps.GlobalUI.js similarity index 99% rename from app/assets/javascripts/src/Metamaps.GlobalUI.js.erb rename to app/assets/javascripts/src/Metamaps.GlobalUI.js index d7904386..d8b91a31 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -503,7 +503,7 @@ Metamaps.GlobalUI.Search = { return Hogan.compile(topicheader + $('#topicSearchTemplate').html()).render({ value: "No results", label: "No results", - typeImageURL: "<%= asset_path('icons/wildcard.png') %>", + typeImageURL: Metamaps.Erb['icons/wildcard.png'], rtype: "noresult" }); }, @@ -571,7 +571,7 @@ Metamaps.GlobalUI.Search = { value: "No results", label: "No results", rtype: "noresult", - profile: "<%= asset_path('user.png') %>", + profile: Metamaps.Erb['user.png'] }); }, header: mapperheader, diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb index 1732b30d..7d35e54a 100644 --- a/app/assets/javascripts/src/Metamaps.js.erb +++ b/app/assets/javascripts/src/Metamaps.js.erb @@ -24,6 +24,7 @@ Metamaps.Erb = {} 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.Settings = { embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages