diff options
-rw-r--r-- | js/main.js | 39 | ||||
-rw-r--r-- | view/php/theme_init.php | 7 | ||||
-rw-r--r-- | view/theme/redbasic/php/theme_init.php | 5 |
3 files changed, 46 insertions, 5 deletions
diff --git a/js/main.js b/js/main.js index f9dc95daa..e1769f77a 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,3 +1203,42 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } + +// provide jquery.browser so we can get rid of the migration toolkit + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + + +// Don't clobber any existing jQuery.browser in case it's different +if ( !jQuery.browser ) { + matched = jQuery.uaMatch( navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + } + + // Chrome is Webkit, but Webkit is also Safari. + if ( browser.chrome ) { + browser.webkit = true; + } else if ( browser.webkit ) { + browser.safari = true; + } + + jQuery.browser = browser; +} diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 69d99893a..c33187797 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,20 +1,17 @@ <?php - - require_once('include/plugin.php'); - head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); -head_add_css('library/font_awesome/css/font-awesome.min.css'); +// head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); -head_add_js('js/jquery-migrate-1.1.1.js'); +// head_add_js('js/jquery-migrate-1.1.1.js'); head_add_js('js/spin.js'); head_add_js('js/jquery.spin.js'); head_add_js('js/jquery.textinputs.js'); diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php new file mode 100644 index 000000000..ccb85a070 --- /dev/null +++ b/view/theme/redbasic/php/theme_init.php @@ -0,0 +1,5 @@ +<?php + +head_add_css('library/font_awesome/css/font-awesome.min.css'); +require_once('view/php/theme_init.php'); + |