harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of jquery.browser warnings by removing msie hacks in two places, live update and fancybox

Browse Source
This commit is contained in:
friendica 2013-05-09 18:24:52 -07:00
parent 112dbf3abd
commit 7dfea2c70d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/main.js
View File

@ -122,7 +122,7 @@
$(function() {
$.ajaxSetup({cache: false});
msie = $.browser.msie ;
msie = false; // $.browser.msie ;
/* setup tooltips *//*
$("a,.tt").each(function(){

5
library/fancybox/jquery.fancybox-1.3.4.js
View File

@ -26,7 +26,8 @@
titleHeight = 0, titleStr = '', start_pos, final_pos, busy = false, fx = $.extend($('<div/>')[0], { prop: 0 }),
isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest,
isIE6 = false,
// $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest,
/*
* Private methods
@ -612,7 +613,7 @@
}
if (currentOpts.type == 'iframe') {
$('<iframe id="fancybox-frame" name="fancybox-frame' + new Date().getTime() + '" frameborder="0" hspace="0" ' + ($.browser.msie ? 'allowtransparency="true""' : '') + ' scrolling="' + selectedOpts.scrolling + '" src="' + currentOpts.href + '"></iframe>').appendTo(content);
$('<iframe id="fancybox-frame" name="fancybox-frame' + new Date().getTime() + '" frameborder="0" hspace="0" ' + ' scrolling="' + selectedOpts.scrolling + '" src="' + currentOpts.href + '"></iframe>').appendTo(content);
}
wrap.show();

2
view/php/theme_init.php
View File

@ -15,7 +15,7 @@ head_add_js('js/jquery.js');
head_add_js('js/jquery-migrate-1.1.1.js');
head_add_js('js/jquery.textinputs.js');
head_add_js('js/fk.autocomplete.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
head_add_js('library/jquery.timeago.js');
head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
head_add_js('library/jquery_ac/friendica.complete.js');