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

get rid of undefined $ error by mangling theme specific JS include order

Browse Source
This commit is contained in:
friendica 2012-12-13 04:47:06 -08:00
parent 4e192b108d
commit c360565d0a
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@ -346,6 +346,9 @@ if($a->module != 'install') {
require_once(theme_include('theme_init.php')); require_once(theme_include('theme_init.php'));
if(($p = theme_include(current_theme() . '.js')) != '')
head_add_js($p);
if(($p = theme_include('mod_' . $a->module . '.php')) != '') if(($p = theme_include('mod_' . $a->module . '.php')) != '')
require_once($p); require_once($p);

33
js/main.js
View File

@ -870,6 +870,23 @@ $("abbr.wall-item-ago-time").timeago();
//reCalcHeight(); //reCalcHeight();
});
function zFormError(elm,x) {
if(x) {
$(elm).addClass("zform-error");
$(elm).removeClass("zform-ok");
}
else {
$(elm).addClass("zform-ok");
$(elm).removeClass("zform-error");
}
}
$(window).scroll(function () { $(window).scroll(function () {
if(typeof buildCmd == 'function') { if(typeof buildCmd == 'function') {
$('#more').hide(); $('#more').hide();
@ -893,19 +910,3 @@ $(window).scroll(function () {
}); });
});
function zFormError(elm,x) {
if(x) {
$(elm).addClass("zform-error");
$(elm).removeClass("zform-ok");
}
else {
$(elm).addClass("zform-ok");
$(elm).removeClass("zform-error");
}
}

3
view/php/theme_init.php
View File

@ -9,8 +9,6 @@ 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/bin/jquery.slider.min.css'); head_add_css('library/jslider/bin/jquery.slider.min.css');
head_add_js('js/jquery.js'); head_add_js('js/jquery.js');
head_add_js('js/jquery.textinputs.js'); head_add_js('js/jquery.textinputs.js');
head_add_js('js/fk.autocomplete.js'); head_add_js('js/fk.autocomplete.js');
@ -25,3 +23,4 @@ head_add_js('js/acl.js');
head_add_js('js/webtoolkit.base64.js'); head_add_js('js/webtoolkit.base64.js');
head_add_js('js/main.js'); head_add_js('js/main.js');
head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');

2
view/theme/redbasic/php/theme.php
View File

@ -1,5 +1,5 @@
<?php <?php
function redbasic_init(&$a) { function redbasic_init(&$a) {
head_add_js('redbasic.js'); // head_add_js('redbasic.js');
} }