Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix some prompts

  • Loading branch information...
commit ab6e3d6f18f49cc9ad4d512a911f6194ed339ac0 1 parent b1e7785
David Morley authored
BIN  app/assets/images/icons/fullscreen.png
1  app/assets/javascripts/publisher.js
@@ -69,6 +69,7 @@ var Publisher = {
69 69
 
70 70
   isPublicPost: function(){
71 71
     return $('#publisher [name="aspect_ids[]"]').first().val() == "public";
  72
+    Publisher.createCounter();
72 73
   },
73 74
 
74 75
   isToAllAspects: function(){
5  app/views/shared/_publisher.html.haml
@@ -2,9 +2,6 @@
2 2
 -#   licensed under the Affero General Public License version 3 or later.  See
3 3
 -#   the COPYRIGHT file.
4 4
 
5  
-#diasotip{:style => "display: none;"}
6  
-  Protip: Shorten a url by adding a extra / to it, eg http:///domain.com
7  
-
8 5
 -if publisher_explain
9 6
   :javascript
10 7
     $(document).ready(function() {
@@ -43,7 +40,7 @@
43 40
         Notice: Public posts are readable by all, users, non-users, web spiders, web robots etc.
44 41
 
45 42
       .options_and_submit
46  
-        .betapublisher
  43
+        .betapublisher{:style => "float:right;"}
47 44
           = link_to ('Try the Beta Publisher'), "#composer", :rel => "facebox"
48 45
           #composer{:style => "display:none;"}
49 46
             %iframe{:src => '/posts/new', :height => 700, :width => 1100, :style => "border:none;"}
2  app/views/shared/_stream_element.mobile.haml
@@ -3,7 +3,7 @@
3 3
 -#   the COPYRIGHT file.
4 4
 
5 5
 .stream_element{:data=>{:guid=>post.id}}
6  
-  - if :nsfw?
  6
+  - if post.respond_to?(:nsfw?) && post.nsfw?
7 7
     .shield_wrapper
8 8
       .shield
9 9
         = t("javascripts.stream.nsfw")
8  public/testing.js
@@ -5,6 +5,14 @@ $(".diaspora_header_logo").live("mouseover", function() {
5 5
 });
6 6
 
7 7
 $(document).ready(function() {
  8
+//dia.so
  9
+$("#status_message_fake_text").blur(function() {
  10
+var text = $('#status_message_fake_text').val();
  11
+  if (text.match(/:\/\//ig)) {
  12
+     Diaspora.page.flashMessages.render({success: true, notice: "Protip: Auto-Shorten a url with dia.so by adding a extra / to it in your post, eg http:///domain.com"});
  13
+  }
  14
+});
  15
+//fullscreen
8 16
   var temp = readCookie('fullscreen');
9 17
   if (temp) {
10 18
     var fullscreen = temp;
3  vendor/assets/javascripts/jquery.charcount.js
@@ -34,9 +34,6 @@
34 34
 			var count = $(obj).val().length;
35 35
 			var word = $(obj).val().split(' ');
36 36
 			$.each(word, function(key, value) {
37  
-			if (value.match(/:\/\//ig)) {
38  
-                        $('#diasotip').show(900);
39  
-                        }
40 37
 			if (value.match(/:\/\/\//ig)) {count = count - value.length + 16;}});
41 38
 			var available = options.allowed - count;
42 39
 			if(available <= options.warning && available >= 0){

0 notes on commit ab6e3d6

Please sign in to comment.
Something went wrong with that request. Please try again.