mirror of
https://github.com/friendica/friendica
synced 2024-12-22 18:00:16 +00:00
Merge pull request #51 from simonlnu/master
RFC, request for comments: about the https for html5shiv
This commit is contained in:
commit
6e76d9d3a3
2 changed files with 2 additions and 3 deletions
|
@ -11,7 +11,7 @@
|
|||
<link rel="search"
|
||||
href="$baseurl/opensearch"
|
||||
type="application/opensearchdescription+xml"
|
||||
title="Search in Friendika" />
|
||||
title="Search in Friendica" />
|
||||
|
||||
<!--[if IE]>
|
||||
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
|
||||
|
|
|
@ -15,7 +15,7 @@ function initEditor(cb){
|
|||
$("a#jot-perms-icon").fancybox({
|
||||
'transitionIn' : 'elastic',
|
||||
'transitionOut' : 'elastic'
|
||||
});
|
||||
});
|
||||
$(".jothidden").show();
|
||||
if (typeof cb!="undefined") cb();
|
||||
return;
|
||||
|
@ -129,7 +129,6 @@ function enableOnUser(){
|
|||
$("#profile-jot-text").focus(enableOnUser);
|
||||
$("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
|
||||
var uploader = new window.AjaxUpload(
|
||||
'wall-image-upload',
|
||||
{ action: 'wall_upload/$nickname',
|
||||
|
|
Loading…
Reference in a new issue