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

further improved explore maps switching

Browse source
This commit is contained in:
Connor Turland 2014-08-11 22:47:38 -04:00
parent 5627b59d59
commit 9d6cf2c3c8
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/metamaps/Metamaps.Backbone.js
View file

@ -94,8 +94,6 @@ Metamaps.Backbone.MapsCollection = Backbone.Collection.extend({
}, },
getMaps: function () { getMaps: function () {
Metamaps.Loading.loader.show();
var self = this; var self = this;
this.fetch({ this.fetch({

5
app/assets/javascripts/metamaps/Metamaps.Router.js
View file

@ -75,7 +75,10 @@
Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] ); Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] );
if (Metamaps.Maps[capitalize].length === 0) { if (Metamaps.Maps[capitalize].length === 0) {
Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render Metamaps.Loading.loader.show();
setTimeout(function(){
Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render
}, 1000); // wait 500 milliseconds till the other animations are done to do the fetch
} }
else { else {
Metamaps.Views.exploreMaps.render(); Metamaps.Views.exploreMaps.render();

5
app/assets/stylesheets/base.css
View file

@ -413,7 +413,7 @@ float:left;
} }
.addLink div { .addLink div {
display: inline-block; float: left;
} }
#addLinkBack { #addLinkBack {
@ -433,7 +433,7 @@ padding: 7px 31px 7px 31px;
height: 16px; height: 16px;
width: 172px; width: 172px;
margin: 0 0 0 0; margin: 0 0 0 0;
border: 1px solid #EFEFEF; border: 1px solid #BDBDBD;
outline: none; outline: none;
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
@ -449,6 +449,7 @@ font-family: 'LatoLight';
width: 32px; width: 32px;
height: 32px; height: 32px;
cursor: pointer; cursor: pointer;
float:none;
} }
.cardSettings { .cardSettings {