jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #51 from simonlnu/master

Browse source 
RFC, request for comments: about the https for html5shiv
This commit is contained in:
Simon 2012-02-26 22:20:46 -08:00
commit 6e76d9d3a3
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/head.tpl
View file

@ -11,7 +11,7 @@
<link rel="search" <link rel="search"
href="$baseurl/opensearch" href="$baseurl/opensearch"
type="application/opensearchdescription+xml" type="application/opensearchdescription+xml"
title="Search in Friendika" /> title="Search in Friendica" />
<!--[if IE]> <!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>

3
view/jot-header.tpl
View file

@ -15,7 +15,7 @@ function initEditor(cb){
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
return; return;
@ -129,7 +129,6 @@ function enableOnUser(){
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
var uploader = new window.AjaxUpload( var uploader = new window.AjaxUpload(
'wall-image-upload', 'wall-image-upload',
{ action: 'wall_upload/$nickname', { action: 'wall_upload/$nickname',