PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-01-31 11:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed https issues

Browse source
This commit is contained in:
nelsonlaquet 2013-09-01 04:55:59 -05:00
parent 3c561903c7
commit 98eabe58de
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/library/Assets.php
View file

@ -60,6 +60,7 @@
new FileAsset('scripts/base/angular-ui-date.js'),
new FileAsset('scripts/base/angular-ui-router.js'),
new FileAsset('scripts/base/angularytics.js'),
new FileAsset('scripts/base/tumblr.js'),
new AssetCollection([
new GlobAsset('scripts/shared/*.coffee'),
], [

2
app/library/Gravatar.php
View file

@ -12,7 +12,7 @@
 * @source http://gravatar.com/site/implement/images/php/
 */
public static function getUrl( $email, $s = 80, $d = 'mm', $r = 'g') {
$url = 'http://www.gravatar.com/avatar/';
$url = 'https://www.gravatar.com/avatar/';
$url .= md5( strtolower( trim( $email ) ) );
$url .= "?s=$s&d=$d&r=$r";
return $url;

4
app/views/shared/_app_layout.blade.php
View file

@ -86,7 +86,7 @@
@endsection
@section('styles')
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Josefin+Sans" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin+Sans" />
<link rel="stylesheet" href="/styles/loader.css" />
{{ Assets::styleIncludes() }}
@endsection
@ -123,6 +123,4 @@
{{ Assets::scriptIncludes() }}
<script src="http://platform.tumblr.com/v1/share.js"></script>
@endsection

3
public/scripts/base/tumblr.js Normal file
View file

@ -0,0 +1,3 @@
var Tumblr=window.Tumblr||{};(function(){Tumblr.share_on_tumblr=function(anchor){var advanced=anchor.href.match(/(www.)?tumblr(\.com)?(\:\d{2,4})?\/share(.+)?/i);advanced=(advanced[4]!==undefined&&advanced[4].length>1);var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f="http://www.tumblr.com/share",l=d.location,e=encodeURIComponent,p="?v=3&u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s),u=f+p;if(advanced){u=anchor.href}try{if(!/^(.*\.)?tumblr[^.]*$/.test(l.host)){throw (0)}tstbklt()}catch(z){a=function(){if(!w.open(u,"t","toolbar=0,resizable=0,status=1,width=450,height=430")){l.href=u}};if(/Firefox/.test(navigator.userAgent)){setTimeout(a,0)}else{a()}}void (0)};Tumblr.activate_share_on_tumblr_buttons=function(){var anchors=document.getElementsByTagName("a"),anchors_length=anchors.length,match=false,old_onclick;for(var i=0;i<anchors_length;i++){match=anchors[i].href.match(/(www.)?tumblr(\.com)?(\:\d{2,4})?\/share(.+)?/i);if(match){old_onclick=anchors[i].onclick;anchors[i].onclick=function(e){Tumblr.share_on_tumblr(this);if(old_onclick){old_onclick()}old_onclick=false;e.preventDefault()}}}};(function(i){var u=navigator.userAgent;var e=
/*@cc_on!@*/
false;var st=setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10)}},10)}else{if((/mozilla/i.test(u)&&!/(compati)/.test(u))||(/opera/i.test(u))){document.addEventListener("DOMContentLoaded",i,false)}else{if(e){(function(){var t=document.createElement("doc:rdy");try{t.doScroll("left");i();t=null}catch(e){st(arguments.callee,0)}})()}else{window.onload=i}}}})(Tumblr.activate_share_on_tumblr_buttons)}());