Skip to content

Commit

Permalink
bug fix: the popup for copying and pasting a photo's URL wasn't work …
Browse files Browse the repository at this point in the history
…(bug introduced in 3.4.7)
  • Loading branch information
Michael Toppa committed Jan 11, 2014
1 parent 954b1bc commit 218d44a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion public/display/prettyphoto/jquery.prettyPhoto.js
Expand Up @@ -92,7 +92,7 @@
iframe_markup: '<iframe src ="{path}" width="{width}" height="{height}" frameborder="no"></iframe>',
inline_markup: '<div class="pp_inline">{content}</div>',
custom_markup: '',
social_tools: '<div class="pp_twitter"><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script><a href="https://twitter.com/intent/tweet?url={location_href}&amp;text={text}" class="twitter-share-button" data-count="none">Tweet</a></div><div class="pp_facebook"><a href="http://www.facebook.com/sharer.php?s=100&amp;p[images][0]={path}&amp;p[url]={location_href}&amp;p[title]={text}" target="_blank" onclick="shashinPopup(this.href, 550, 450); return false;">Share on Facebook</a></div><div class="pp_pinterest"><a href="http://pinterest.com/pin/create/button/?url={location_href}&amp;media={path}&amp;description={text}" target="_blank" onclick="shashinPopup(this.href, 550, 450); return false;">Pin it</a></div><div class="pp_link"><a href="#" onclick="shashinLinkPrompt(&#39;{location_href}&#39;); return false;">Share link</a></div>' /* html or false to disable */
social_tools: '<div class="pp_twitter"><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script><a href="https://twitter.com/intent/tweet?url={location_href}&amp;text={text}" class="twitter-share-button" data-count="none">Tweet</a></div><div class="pp_facebook"><a href="http://www.facebook.com/sharer.php?s=100&amp;p[images][0]={path}&amp;p[url]={location_href}&amp;p[title]={text}" target="_blank" onclick="Shashin.popup(this.href, 550, 450); return false;">Share on Facebook</a></div><div class="pp_pinterest"><a href="http://pinterest.com/pin/create/button/?url={location_href}&amp;media={path}&amp;description={text}" target="_blank" onclick="Shashin.popup(this.href, 550, 450); return false;">Pin it</a></div><div class="pp_link"><a href="#" onclick="Shashin.linkPrompt(&#39;{location_href}&#39;); return false;">Share link</a></div>' /* html or false to disable */
}, pp_settings);

// Global variables accessible only by prettyphoto
Expand Down
4 changes: 2 additions & 2 deletions public/display/shashin.js
Expand Up @@ -440,7 +440,7 @@ var Shashin = (function($) {


return {
shashinPopup: popup,
shashinLinkPrompt: linkPrompt
popup: popup,
linkPrompt: linkPrompt
}
})(jQuery);

0 comments on commit 218d44a

Please sign in to comment.