Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1368) +++ branches/2.8.x/CHANGELOG (revision 1369) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +31 Dec-2010 Build 1369 Dietmar Woellbrink (Luisehahne) ++ add jquery-include.js (Tks to Stefek) +! update bind jquery in frontend, jquery-include.js and jquery-insrt.js are included 31 Dec-2010 Build 1368 Dietmar Woellbrink (Luisehahne) - delete class.secureform.php + add newest SecureForm Index: branches/2.8.x/wb/include/jquery/jquery-include.js =================================================================== --- branches/2.8.x/wb/include/jquery/jquery-include.js (nonexistent) +++ branches/2.8.x/wb/include/jquery/jquery-include.js (revision 1369) @@ -0,0 +1,116 @@ +(function($){ +/* + * includeMany 1.2.2 + * + * Copyright (c) 2009 Arash Karimzadeh (arashkarimzadeh.com) + * Licensed under the MIT (MIT-LICENSE.txt) + * http://www.opensource.org/licenses/mit-license.php + * + * Date: Dec 03 2009 + */ +$.chainclude = function(urls,finaly){ + var onload = function(callback,data){ + if(typeof urls.length!='undefined'){ + if(urls.length==0) + return $.isFunction(finaly) + ?finaly(data) + :null; + urls.shift(); + return $.chainclude.load(urls,onload); + } + for(var item in urls){ + urls[item](data); + delete urls[item]; + var count = 0; + for(var i in urls) + count++; + return (count==0) + ?$.isFunction(finaly)?finaly(data):null + :$.chainclude.load(urls,onload); + } + } + $.chainclude.load(urls,onload); +}; +$.chainclude.load = function(urls,onload){ + if(typeof urls=='object' && typeof urls.length=='undefined') + for(var item in urls) + return $.include.load(item,onload,urls[item].callback); + urls = $.makeArray(urls); + $.include.load(urls[0],onload,null); +}; +$.include = function(urls,finaly){ + var luid = $.include.luid++; + var onload = function(callback,data){ + if($.isFunction(callback)) + callback(data); + if(--$.include.counter[luid]==0&&$.isFunction(finaly)) + finaly(); + } + if(typeof urls=='object' && typeof urls.length=='undefined'){ + $.include.counter[luid] = 0; + for(var item in urls) + $.include.counter[luid]++; + return $.each(urls,function(url,callback){$.include.load(url,onload,callback);}); + } + urls = $.makeArray(urls); + $.include.counter[luid] = urls.length; + $.each(urls,function(){$.include.load(this,onload,null);}); +} +$.extend( + $.include, + { + luid: 0, + counter: [], + load: function(url,onload,callback){ + url = url.toString(); + if($.include.exist(url)) + return onload(callback); + if(/.css$/.test(url)) + $.include.loadCSS(url,onload,callback); + else if(/.js$/.test(url)) + $.include.loadJS(url,onload,callback); + else + $.get(url,function(data){onload(callback,data)}); + }, + loadCSS: function(url,onload,callback){ + var css=document.createElement('link'); + css.setAttribute('type','text/css'); + css.setAttribute('rel','stylesheet'); + css.setAttribute('href',''+url); + $('head').get(0).appendChild(css); + $.browser.msie + ?$.include.IEonload(css,onload,callback) + :onload(callback);//other browsers do not support it + }, + loadJS: function(url,onload,callback){ + var js=document.createElement('script'); + js.setAttribute('type','text/javascript'); + js.setAttribute('src',''+url); + $.browser.msie + ?$.include.IEonload(js,onload,callback) + :js.onload = function(){onload(callback)}; + $('head').get(0).appendChild(js); + }, + IEonload: function(elm,onload,callback){ + elm.onreadystatechange = + function(){ + if(this.readyState=='loaded'||this.readyState=='complete') + onload(callback); + } + }, + exist: function(url){ + var fresh = false; + $('head script').each( + function(){ + if(/.css$/.test(url)&&this.href==url) + return fresh=true; + else if(/.js$/.test(url)&&this.src==url) + return fresh=true; + } + ); + return fresh; + } + } +); +// +})(jQuery); Property changes on: branches/2.8.x/wb/include/jquery/jquery-include.js ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Revision Id HeadURL \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2.8.x/wb/include/jscalendar/wb-setup.php =================================================================== --- branches/2.8.x/wb/include/jscalendar/wb-setup.php (revision 1368) +++ branches/2.8.x/wb/include/jscalendar/wb-setup.php (revision 1369) @@ -47,7 +47,7 @@ $jscal_lang = 'en'; } // today - $jscal_today = gmdate('Y/m/d'); + $jscal_today = gmdate('Y/m/d H:i'); // first-day-of-week $jscal_firstday = '1'; // monday if(LANGUAGE=='EN') @@ -81,6 +81,7 @@ $jscal_format .= ' H:i'; $jscal_ifformat .= ' %H:%M'; } + // load scripts for jscalendar ?> Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1368) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1369) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC3'); -if(!defined('REVISION')) define('REVISION', '1368'); +if(!defined('REVISION')) define('REVISION', '1369'); ?> \ No newline at end of file Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1368) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1369) @@ -421,6 +421,7 @@ $jquery_links .= ''."\n"; $jquery_links .= ''."\n"; + $jquery_links .= ''."\n"; /* workout to insert ui.css and theme */ $jquery_theme = WB_PATH.'/modules/jquery/jquery_theme.js'; $jquery_links .= file_exists($jquery_theme)