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

Metmaps.Account and Metamaps.GlobalUI remove extension

Browse source
This commit is contained in:
Devin Howard 2016-04-24 12:59:24 +08:00
parent 21e665450f
commit b230c343b1
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/src/Metamaps.Account.js.erb → app/assets/javascripts/src/Metamaps.Account.js
View file

@ -3,7 +3,8 @@
/* /*
* Metamaps.Account.js.erb * Metamaps.Account.js.erb
* *
* Dependencies: none! * Dependencies:
* - Metamaps.Erb
*/ */
Metamaps.Account = { Metamaps.Account = {
@ -95,7 +96,7 @@ Metamaps.Account = {
var self = Metamaps.Account var self = Metamaps.Account
$('.userImageDiv canvas').remove() $('.userImageDiv canvas').remove()
$('.userImageDiv img').attr('src', '<%= asset_path('user.png') %>').show() $('.userImageDiv img').attr('src', Metamaps.Erb['user.png']) %>').show()
$('.userImageMenu').hide() $('.userImageMenu').hide()
var input = $('#user_image') var input = $('#user_image')

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

@ -503,7 +503,7 @@ Metamaps.GlobalUI.Search = {
return Hogan.compile(topicheader + $('#topicSearchTemplate').html()).render({ return Hogan.compile(topicheader + $('#topicSearchTemplate').html()).render({
value: "No results", value: "No results",
label: "No results", label: "No results",
typeImageURL: "<%= asset_path('icons/wildcard.png') %>", typeImageURL: Metamaps.Erb['icons/wildcard.png'],
rtype: "noresult" rtype: "noresult"
}); });
}, },
@ -571,7 +571,7 @@ Metamaps.GlobalUI.Search = {
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']
}); });
}, },
header: mapperheader, header: mapperheader,

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

@ -24,6 +24,7 @@ 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.Erb['user.png'] = '<%= asset_path('user.png') %>'
Metamaps.Erb['icons/wildcard.png'] = '<%= asset_path('icons/wildcard.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