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

Remove erb extension from Metamaps.Map.js

Browse source
This commit is contained in:
Devin Howard 2016-04-24 12:56:17 +08:00
parent ba7bd2a7d0
commit 21e665450f
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/assets/javascripts/src/Metamaps.Map.js.erb → app/assets/javascripts/src/Metamaps.Map.js
View file

@ -4,17 +4,18 @@
* Metamaps.Map.js.erb * Metamaps.Map.js.erb
* *
* Dependencies: * Dependencies:
* Metamaps.Create * - Metamaps.Create
* Metamaps.Filter * - Metamaps.Erb
* Metamaps.JIT * - Metamaps.Filter
* Metamaps.Loading * - Metamaps.JIT
* Metamaps.Maps * - Metamaps.Loading
* Metamaps.Realtime * - Metamaps.Maps
* Metamaps.Router * - Metamaps.Realtime
* Metamaps.Selected * - Metamaps.Router
* Metamaps.SynapseCard * - Metamaps.Selected
* Metamaps.TopicCard * - Metamaps.SynapseCard
* Metamaps.Visualize * - Metamaps.TopicCard
* - Metamaps.Visualize
* - Metamaps.Active * - Metamaps.Active
* - Metamaps.Backbone * - Metamaps.Backbone
* - Metamaps.GlobalUI * - Metamaps.GlobalUI
@ -490,7 +491,7 @@ Metamaps.Map.InfoBox = {
obj['contributor_count'] = relevantPeople.length obj['contributor_count'] = relevantPeople.length
obj['contributors_class'] = relevantPeople.length > 1 ? 'multiple' : '' obj['contributors_class'] = relevantPeople.length > 1 ? 'multiple' : ''
obj['contributors_class'] += relevantPeople.length === 2 ? ' mTwo' : '' obj['contributors_class'] += relevantPeople.length === 2 ? ' mTwo' : ''
obj['contributor_image'] = relevantPeople.length > 0 ? relevantPeople.models[0].get('image') : "<%= asset_path('user.png') %>" obj['contributor_image'] = relevantPeople.length > 0 ? relevantPeople.models[0].get('image') : Metamaps.Erb['user.png'] %>"
obj['contributor_list'] = self.createContributorList() obj['contributor_list'] = self.createContributorList()
obj['user_name'] = isCreator ? 'You' : map.get('user_name') obj['user_name'] = isCreator ? 'You' : map.get('user_name')
@ -580,7 +581,7 @@ Metamaps.Map.InfoBox = {
value: "No results", value: "No results",
label: "No results", label: "No results",
rtype: "noresult", rtype: "noresult",
profile: "<%= asset_path('user.png') %>", profile: Metamaps.Erb['user.png'],
}); });
}, },
suggestion: function(s) { suggestion: function(s) {
@ -680,7 +681,7 @@ Metamaps.Map.InfoBox = {
if (relevantPeople.length === 2) contributors_class = 'multiple mTwo' if (relevantPeople.length === 2) contributors_class = 'multiple mTwo'
else if (relevantPeople.length > 2) contributors_class = 'multiple' else if (relevantPeople.length > 2) contributors_class = 'multiple'
var contributors_image = "<%= asset_path('user.png') %>" var contributors_image = Metamaps.Erb['user.png']
if (relevantPeople.length > 0) { if (relevantPeople.length > 0) {
// get the first contributor and use their image // get the first contributor and use their image
contributors_image = relevantPeople.models[0].get('image') contributors_image = relevantPeople.models[0].get('image')

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

@ -23,6 +23,7 @@ Metamaps.VERSION = '<%= METAMAPS_VERSION %>'
Metamaps.Erb = {} Metamaps.Erb = {}
Metamaps.Erb['REALTIME_SERVER'] = '<%= ENV['REALTIME_SERVER'] %>' 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.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