fixed publisher in chrome and broke it out to a seperate js file
This commit is contained in:
parent
a685c6c0ab
commit
eebed9d457
7 changed files with 33 additions and 52 deletions
|
|
@ -9,7 +9,7 @@
|
||||||
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
|
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
|
||||||
= stylesheet_link_tag "application"
|
= stylesheet_link_tag "application"
|
||||||
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
|
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
|
||||||
= javascript_include_tag 'jquery142', 'rails', 'view'
|
= javascript_include_tag 'jquery142', 'rails', 'view', 'publisher'
|
||||||
= javascript_include_tag 'tiny_mce/tiny_mce.js'
|
= javascript_include_tag 'tiny_mce/tiny_mce.js'
|
||||||
:javascript
|
:javascript
|
||||||
var _gaq = _gaq || [];
|
var _gaq = _gaq || [];
|
||||||
|
|
@ -58,28 +58,8 @@
|
||||||
$(this).children(".destroy_link").fadeOut(0);
|
$(this).children(".destroy_link").fadeOut(0);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/= javascript_include_tag 'satisfaction' , 'satisfaction-display'
|
/= javascript_include_tag 'satisfaction' , 'satisfaction-display'
|
||||||
:javascript
|
|
||||||
var is_ssl = ("https:" == document.location.protocol);
|
|
||||||
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
|
|
||||||
document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
|
|
||||||
|
|
||||||
:javascript
|
|
||||||
|
|
||||||
var feedback_widget_options = {};
|
|
||||||
|
|
||||||
feedback_widget_options.display = "overlay";
|
|
||||||
feedback_widget_options.company = "diaspora";
|
|
||||||
feedback_widget_options.placement = "right";
|
|
||||||
feedback_widget_options.color = "#222";
|
|
||||||
feedback_widget_options.style = "idea";
|
|
||||||
|
|
||||||
var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%body
|
%body
|
||||||
- flash.each do |name, msg|
|
- flash.each do |name, msg|
|
||||||
= content_tag :div, msg, :id => "flash_#{name}"
|
= content_tag :div, msg, :id => "flash_#{name}"
|
||||||
|
|
|
||||||
|
|
@ -28,32 +28,6 @@
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:javascript
|
|
||||||
$(document).ready( function() {
|
|
||||||
|
|
||||||
$("#publisher_content_pickers li .status_message").click(function(){
|
|
||||||
if( $("#new_status_message").css("display") == "none" ) {
|
|
||||||
$("#publisher_form form").fadeOut(50);
|
|
||||||
$("#new_status_message").delay(50).fadeIn(200);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#publisher_content_pickers li .bookmark").click(function(){
|
|
||||||
if( $("#new_bookmark").css("display") == "none" ) {
|
|
||||||
$("#publisher_form form").fadeOut(50);
|
|
||||||
$("#new_bookmark").delay(50).fadeIn(200);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("#publisher_content_pickers li .blog").click(function(){
|
|
||||||
if( $("#new_blog").css("display") == "none" ) {
|
|
||||||
$("#publisher_form form").fadeOut(50);
|
|
||||||
$("#new_blog").delay(50).fadeIn(200);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
#publisher
|
#publisher
|
||||||
%ul#publisher_content_pickers
|
%ul#publisher_content_pickers
|
||||||
%a{ :class => "status_message", :href => '#', :title => "new status message."}
|
%a{ :class => "status_message", :href => '#', :title => "new status message."}
|
||||||
|
|
|
||||||
24
public/javascripts/publisher.js
Normal file
24
public/javascripts/publisher.js
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
$(document).ready( function() {
|
||||||
|
|
||||||
|
$("#publisher_content_pickers .status_message").click(function(){
|
||||||
|
if( $("#new_status_message").css("display") == "none" ) {
|
||||||
|
$("#publisher_form form").fadeOut(50);
|
||||||
|
$("#new_status_message").delay(50).fadeIn(200);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#publisher_content_pickers .bookmark").click(function(){
|
||||||
|
if( $("#new_bookmark").css("display") == "none" ) {
|
||||||
|
$("#publisher_form form").fadeOut(50);
|
||||||
|
$("#new_bookmark").delay(50).fadeIn(200);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#publisher_content_pickers .blog").click(function(){
|
||||||
|
if( $("#new_blog").css("display") == "none" ) {
|
||||||
|
$("#publisher_form form").fadeOut(50);
|
||||||
|
$("#new_blog").delay(50).fadeIn(200);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
var feedback_widget_options = {};
|
var feedback_widget_options = {};
|
||||||
|
|
||||||
feedback_widget_options.display = "inline";
|
feedback_widget_options.display = "overlay";
|
||||||
feedback_widget_options.company = "diaspora";
|
feedback_widget_options.company = "diaspora";
|
||||||
feedback_widget_options.placement = "left";
|
feedback_widget_options.placement = "right";
|
||||||
feedback_widget_options.color = "#222";
|
feedback_widget_options.color = "#222";
|
||||||
feedback_widget_options.style = "idea";
|
feedback_widget_options.style = "idea";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,4 +49,5 @@ $(document).ready(function(){
|
||||||
|
|
||||||
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
|
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
|
||||||
|
|
||||||
|
|
||||||
});//end document ready
|
});//end document ready
|
||||||
|
|
|
||||||
|
|
@ -233,4 +233,5 @@ textarea {
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
-moz-box-shadow: 0 2px 0px white;
|
-moz-box-shadow: 0 2px 0px white;
|
||||||
border-top: 1px solid #999999; }
|
border-top: 1px solid #999999;
|
||||||
|
clear: both; }
|
||||||
|
|
|
||||||
|
|
@ -280,3 +280,4 @@ textarea
|
||||||
:-moz-box-shadow 0 2px 0px #fff
|
:-moz-box-shadow 0 2px 0px #fff
|
||||||
|
|
||||||
:border-top 1px solid #999
|
:border-top 1px solid #999
|
||||||
|
:clear both
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue