Added some more fades

Samson · Samson · commit 2b1629e0c8ca · 2013-04-08T09:10:26.000Z
diff --git a/js/views/apis/list.js b/js/views/apis/list.js
@@ -106,8 +106,10 @@ define([
       };
       apis.fetch({
         success: function (collection) {
-          that.$el.html(Mustache.render(apisListTemplate, {authed: Session.get('auth'), currentUser: that.options.currentUser, _:_, is_public: that.options.is_public, apis: collection.models, username: Session.get('login'), location: that.options.location}, {listtemplate: apisListItemTemplate}));
-
+          that.$el.hide()
+            .html(Mustache.render(apisListTemplate, {authed: Session.get('auth'), currentUser: that.options.currentUser, _:_, is_public: that.options.is_public, apis: collection.models, username: Session.get('login'), location: that.options.location}, {listtemplate: apisListItemTemplate}))
+            .fadeIn(350);
+            
           // activate the share buttons
           /*_.each(collection.models, function(model) {
 	          addthis.button('#' + model.get('user') + '-' + model.get('name'), {
diff --git a/js/views/app.js b/js/views/app.js
@@ -53,7 +53,7 @@ define([
               'page': $(this).attr('href')
             });
             Backbone.router.navigate($(this).attr('href'), true);
-            $(document).scrollTop(0);
+            //$(document).scrollTop(0);
             return false;
 
           }
diff --git a/js/views/header/header.js b/js/views/header/header.js
@@ -19,7 +19,7 @@ define([
       });
     },
     render: function () {
-      this.$el.hide().fadeIn(250);
+      this.$el.hide().fadeIn(500);
       this.$el.html(Mustache.render(headerLayoutTemplate, {username: Session.get('login')}));
       var mainMenu = new MainMenuView();
       mainMenu.render();
diff --git a/js/views/header/main-menu.js b/js/views/header/main-menu.js
@@ -34,6 +34,14 @@ define([
         $('.logo-cog').rotate({ duration:2000, animateTo:value});
 
       });
+
+      $.ajaxPrefilter( function( options, originalOptions, jqXHR ) {
+ 
+        value +=180;
+        $('.logo-cog').rotate({ duration:4000, animateTo:value});
+
+      });
+
       var accountMenu = Vm.create(this, 'accountmenu', AccountMenuView, {});
       accountMenu.render();
     },
diff --git a/js/views/profile/page.js b/js/views/profile/page.js
@@ -93,7 +93,9 @@ define([
       if(Session.get('login') === that.options.username ) {
         currentUser = true;
       }
-      that.$el.html(Mustache.render(profileTemplate, {user: that.userModel, currentUser: currentUser}));
+      that.$el.hide()
+          .html(Mustache.render(profileTemplate, {user: that.userModel, currentUser: currentUser}))
+          .fadeIn(700);
           $('.timeago').timeago();
       this.renderSettings();
     },
diff --git a/js/views/settings/page.js b/js/views/settings/page.js
@@ -21,7 +21,10 @@ define([
     render: function (options) {
       $('.tabs-container li').removeClass('active');
       $('.tabs-container .settings').addClass('active');
-      this.$el.html(_.template(pageTemplate, {user: Session.get('user')}));
+      if($('.settings-container').length === 0) {
+
+        this.$el.hide().html(_.template(pageTemplate, {user: Session.get('user')})).fadeIn(350);
+      }
       switch(options.setting){
       case 'profile':
           var profileView = new ProfileView();

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ define([`
`53`	`53`	`'page': $(this).attr('href')`
`54`	`54`	`});`
`55`	`55`	`Backbone.router.navigate($(this).attr('href'), true);`
`56`		`- $(document).scrollTop(0);`
	`56`	`+ //$(document).scrollTop(0);`
`57`	`57`	`return false;`
`58`	`58`
`59`	`59`	`}`