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

make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit.

Browse Source
This commit is contained in:
friendica 2013-11-25 19:07:58 -08:00
parent bed0bca4d7
commit 95824642a6
3 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/main.js
View File

@ -1203,3 +1203,42 @@ function zid(s) {
s = s + achar + 'f=&zid=' + zid; s = s + achar + 'f=&zid=' + zid;
return s; 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;
}

7
view/php/theme_init.php
View File

@ -1,20 +1,17 @@
<?php <?php
require_once('include/plugin.php'); require_once('include/plugin.php');
head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
head_add_css('library/tiptip/tipTip.css'); head_add_css('library/tiptip/tipTip.css');
head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jgrowl/jquery.jgrowl.css');
head_add_css('library/jslider/css/jslider.css'); head_add_css('library/jslider/css/jslider.css');
head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css');
head_add_css('library/colorbox/colorbox.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.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/spin.js');
head_add_js('js/jquery.spin.js'); head_add_js('js/jquery.spin.js');
head_add_js('js/jquery.textinputs.js'); head_add_js('js/jquery.textinputs.js');

5
view/theme/redbasic/php/theme_init.php Normal file
View File

@ -0,0 +1,5 @@
<?php
head_add_css('library/font_awesome/css/font-awesome.min.css');
require_once('view/php/theme_init.php');