From 2ee329d7861e6f1497061ca6adbb23fbc0a747a7 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 24 Feb 2012 22:36:37 -0800 Subject: [PATCH] make sneaky passive by default. this fixes the bug where a user would like something when the interaction pane is active and the sneaky would show up when the feedback view was re-rendered. --- public/javascripts/app/pages/post-viewer.js | 2 +- .../app/templates/post-viewer/feedback.handlebars | 2 +- public/javascripts/app/views/post-viewer/feedback.js | 10 ++++++++++ .../javascripts/app/views/post-viewer/interactions.js | 6 ++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/public/javascripts/app/pages/post-viewer.js b/public/javascripts/app/pages/post-viewer.js index 8f5e8eab9..58ea172f6 100644 --- a/public/javascripts/app/pages/post-viewer.js +++ b/public/javascripts/app/pages/post-viewer.js @@ -35,7 +35,7 @@ app.pages.PostViewer = app.views.Base.extend({ }, prepIdleHooks : function () { - $.idleTimer(2000); + $.idleTimer(3000); $(document).bind("idle.idleTimer", function(){ $("body").addClass('idle'); diff --git a/public/javascripts/app/templates/post-viewer/feedback.handlebars b/public/javascripts/app/templates/post-viewer/feedback.handlebars index c1464f631..a458b489c 100644 --- a/public/javascripts/app/templates/post-viewer/feedback.handlebars +++ b/public/javascripts/app/templates/post-viewer/feedback.handlebars @@ -33,7 +33,7 @@ -
+
diff --git a/public/javascripts/app/views/post-viewer/feedback.js b/public/javascripts/app/views/post-viewer/feedback.js index ec49c58f6..5aa0b8dae 100644 --- a/public/javascripts/app/views/post-viewer/feedback.js +++ b/public/javascripts/app/views/post-viewer/feedback.js @@ -16,6 +16,16 @@ app.views.PostViewerFeedback = app.views.Feedback.extend({ tooltipSelector : ".label", + postRenderTemplate : function() { + this.sneakyVisiblity() + }, + + sneakyVisiblity : function() { + if(!$("#post-info").is(":visible")) { + this.$("#post-info-sneaky").removeClass('passive') + } + }, + invokePane : function(evt){ this.trigger("invokePane") }, hidePane : function(evt){ this.trigger("hidePane") } diff --git a/public/javascripts/app/views/post-viewer/interactions.js b/public/javascripts/app/views/post-viewer/interactions.js index a3df54603..f24561c7f 100644 --- a/public/javascripts/app/views/post-viewer/interactions.js +++ b/public/javascripts/app/views/post-viewer/interactions.js @@ -34,13 +34,11 @@ app.views.PostViewerInteractions = app.views.Base.extend({ this.removeTooltips() }, - invokePane : function(evt) { - if(evt) { evt.preventDefault() } + invokePane : function() { if(!this.$("#post-info").is(":visible")) { this.togglePane() } }, - hidePane : function(evt) { - if(evt) { evt.preventDefault() } + hidePane : function() { if(this.$("#post-info").is(":visible")) { this.togglePane() } } })