glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Metamaps.JIT no more erb extension

Browse source
This commit is contained in:
Devin Howard 2016-04-24 13:01:01 +08:00
parent b230c343b1
commit 24368fef60
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/src/Metamaps.JIT.js.erb → app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -29,10 +29,10 @@ Metamaps.JIT = {
$('.takeScreenshot').click(Metamaps.Map.exportImage) $('.takeScreenshot').click(Metamaps.Map.exportImage)
self.topicDescImage = new Image() 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 = 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 * convert our topic JSON into something JIT can use

2
app/assets/javascripts/src/Metamaps.js.erb
View file

@ -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['junto_spinner_darkgrey.gif'] = '<%= asset_path('junto_spinner_darkgrey.gif') %>'
Metamaps.Erb['user.png'] = '<%= asset_path('user.png') %>' Metamaps.Erb['user.png'] = '<%= asset_path('user.png') %>'
Metamaps.Erb['icons/wildcard.png'] = '<%= asset_path('icons/wildcard.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 = { Metamaps.Settings = {
embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages