Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix some prompts

  • Loading branch information...
commit ab6e3d6f18f49cc9ad4d512a911f6194ed339ac0 1 parent b1e7785
@dmorley dmorley authored
View
BIN  app/assets/images/icons/fullscreen.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  app/assets/javascripts/publisher.js
@@ -69,6 +69,7 @@ var Publisher = {
isPublicPost: function(){
return $('#publisher [name="aspect_ids[]"]').first().val() == "public";
+ Publisher.createCounter();
},
isToAllAspects: function(){
View
5 app/views/shared/_publisher.html.haml
@@ -2,9 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
-#diasotip{:style => "display: none;"}
- Protip: Shorten a url by adding a extra / to it, eg http:///domain.com
-
-if publisher_explain
:javascript
$(document).ready(function() {
@@ -43,7 +40,7 @@
Notice: Public posts are readable by all, users, non-users, web spiders, web robots etc.
.options_and_submit
- .betapublisher
+ .betapublisher{:style => "float:right;"}
= link_to ('Try the Beta Publisher'), "#composer", :rel => "facebox"
#composer{:style => "display:none;"}
%iframe{:src => '/posts/new', :height => 700, :width => 1100, :style => "border:none;"}
View
2  app/views/shared/_stream_element.mobile.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
.stream_element{:data=>{:guid=>post.id}}
- - if :nsfw?
+ - if post.respond_to?(:nsfw?) && post.nsfw?
.shield_wrapper
.shield
= t("javascripts.stream.nsfw")
View
8 public/testing.js
@@ -5,6 +5,14 @@ $(".diaspora_header_logo").live("mouseover", function() {
});
$(document).ready(function() {
+//dia.so
+$("#status_message_fake_text").blur(function() {
+var text = $('#status_message_fake_text').val();
+ if (text.match(/:\/\//ig)) {
+ 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"});
+ }
+});
+//fullscreen
var temp = readCookie('fullscreen');
if (temp) {
var fullscreen = temp;
View
3  vendor/assets/javascripts/jquery.charcount.js
@@ -34,9 +34,6 @@
var count = $(obj).val().length;
var word = $(obj).val().split(' ');
$.each(word, function(key, value) {
- if (value.match(/:\/\//ig)) {
- $('#diasotip').show(900);
- }
if (value.match(/:\/\/\//ig)) {count = count - value.length + 16;}});
var available = options.allowed - count;
if(available <= options.warning && available >= 0){
Please sign in to comment.
Something went wrong with that request. Please try again.