Merge pull request #1878 from vcuculo/1785-fix-bookmarklet

1785 Fix bookmarklet

app/views/status_messages/bookmarklet.html.haml

@@ -13,6 +13,7 @@
   $(document).ready(function() 
     {
       Publisher.open();
+      Publisher.bookmarklet = true;
       $("#publisher").bind('ajax:success', function(){
         $('h4').text("#{t('bookmarklet.post_success')}");
         Publisher.close();

public/javascripts/publisher.js

@@ -5,6 +5,7 @@
 
 //TODO: make this a widget
 var Publisher = {
+  bookmarklet : false,
   close: function(){
     Publisher.form().addClass('closed');
     Publisher.form().find("#publisher_textarea_wrapper").removeClass('active');
@@ -374,24 +375,25 @@ var Publisher = {
     }
   },
   onSuccess: function(data, json, xhr){
-    var isPostVisible = AspectFilters.selectedGUIDS.length == 0;
-    var postedTo = Publisher.selectedAspectIds();
-    $.each(AspectFilters.selectedGUIDS, function(index, value){
-      if(postedTo.indexOf(parseInt(value))>-1)
-        isPostVisible = true;
-    });
-
-    if(isPostVisible) {
-      ContentUpdater.addPostToStream(json.html);
-      Diaspora.page.stream.addPost($("#" + json.post_id));
-    }
-    else {
-      Diaspora.widgets.flashMessages.render({
-        success: true,
-        message: Diaspora.I18n.t('successfully_posted_message_to_an_aspects_that_is_not_visible')
+    if(Publisher.bookmarklet == false){
+      var isPostVisible = AspectFilters.selectedGUIDS.length == 0;
+      var postedTo = Publisher.selectedAspectIds();
+      $.each(AspectFilters.selectedGUIDS, function(index, value){
+        if(postedTo.indexOf(parseInt(value))>-1)
+          isPostVisible = true;
       });
-    }
 
+      if(isPostVisible) {
+        ContentUpdater.addPostToStream(json.html);
+        Diaspora.page.stream.addPost($("#" + json.post_id));
+      }
+      else {
+        Diaspora.widgets.flashMessages.render({
+          success: true,
+          message: Diaspora.I18n.t('successfully_posted_message_to_an_aspects_that_is_not_visible')
+        });
+      }
+    }
     //collapse publisher
     Publisher.close();
     Publisher.clear();

public/stylesheets/sass/application.sass

@@ -899,6 +899,7 @@ label
     textarea
       :resize none
       :width 455px
+      :height 50px 
       :margin 0
 
   &.mention_popup