From 7dfea2c70dd79986f54a6b4e12d25be47a6abc88 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 May 2013 18:24:52 -0700 Subject: get rid of jquery.browser warnings by removing msie hacks in two places, live update and fancybox --- js/main.js | 2 +- library/fancybox/jquery.fancybox-1.3.4.js | 5 +++-- view/php/theme_init.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/main.js b/js/main.js index 0fbc4b517..df161e386 100644 --- a/js/main.js +++ b/js/main.js @@ -122,7 +122,7 @@ $(function() { $.ajaxSetup({cache: false}); - msie = $.browser.msie ; + msie = false; // $.browser.msie ; /* setup tooltips *//* $("a,.tt").each(function(){ diff --git a/library/fancybox/jquery.fancybox-1.3.4.js b/library/fancybox/jquery.fancybox-1.3.4.js index be7727537..43e2cd56b 100644 --- a/library/fancybox/jquery.fancybox-1.3.4.js +++ b/library/fancybox/jquery.fancybox-1.3.4.js @@ -26,7 +26,8 @@ titleHeight = 0, titleStr = '', start_pos, final_pos, busy = false, fx = $.extend($('
')[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') { - $('').appendTo(content); + $('').appendTo(content); } wrap.show(); diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 44ade61d7..e6441fc71 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -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'); -- cgit v1.2.3