From af569204b8ed46e9b5c9e23d2eb677afe5291042 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Thu, 1 Sep 2011 16:31:49 -0700 Subject: [PATCH] Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" This reverts commit e278b394210726806d85965d64b8736d72ceef3a, reversing changes made to d0f21cb4445a62ba50503ac65f31deaaf922b21a. --- app/views/status_messages/bookmarklet.html.haml | 1 - public/javascripts/publisher.js | 4 +--- public/stylesheets/sass/application.sass | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index bbb2133c4..adb24271c 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -13,7 +13,6 @@ $(document).ready(function() { Publisher.open(); - Publisher.bookmarklet = true; $("#publisher").bind('ajax:success', function(){ $('h4').text("#{t('bookmarklet.post_success')}"); Publisher.close(); diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index db58a22fd..e17751999 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -5,7 +5,6 @@ //TODO: make this a widget var Publisher = { - bookmarklet = false, close: function(){ Publisher.form().addClass('closed'); Publisher.form().find("#publisher_textarea_wrapper").removeClass('active'); @@ -375,7 +374,6 @@ var Publisher = { } }, onSuccess: function(data, json, xhr){ - if(Publisher.bookmarklet == false){ var isPostVisible = AspectFilters.selectedGUIDS.length == 0; var postedTo = Publisher.selectedAspectIds(); $.each(AspectFilters.selectedGUIDS, function(index, value){ @@ -393,7 +391,7 @@ var Publisher = { message: Diaspora.I18n.t('successfully_posted_message_to_an_aspects_that_is_not_visible') }); } - } + //collapse publisher Publisher.close(); Publisher.clear(); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c611ff1cd..1f1058bd0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1035,7 +1035,6 @@ label textarea :z-index 2 :border none - :height 50px &:focus :outline 0