From: <lph...@us...> - 2010-01-26 18:57:10
|
Revision: 24677 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24677&view=rev Author: lphuberdeau Date: 2010-01-26 18:56:38 +0000 (Tue, 26 Jan 2010) Log Message: ----------- [NEW] Replace use minified script with using scripts from google CDN, otherwise minify on the fly will work. Modified Paths: -------------- trunk/lib/headerlib.php trunk/lib/prefs/feature.php trunk/lib/setup/js_detect.php trunk/lib/setup/prefs.php trunk/lib/smarty_tiki/block.add_help.php trunk/lib/toolbars/toolbarslib.php trunk/templates/tiki-admin-include-performance.tpl trunk/tiki-admin_toolbars.php trunk/tiki-metrics.php trunk/tiki-setup.php Added Paths: ----------- trunk/lib/prefs/javascript.php Modified: trunk/lib/headerlib.php =================================================================== --- trunk/lib/headerlib.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/headerlib.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -193,9 +193,16 @@ unset( $this->jsfiles['dynamic'] ); } + $external = array(); + if( isset( $this->jsfiles['external'] ) ) { + $external = $this->jsfiles['external']; + unset( $this->jsfiles['external'] ); + } + $jsfiles = $this->getMinifiedJs(); $jsfiles['dynamic'] = $dynamic; + $jsfiles['external'] = $external; } else { $jsfiles = $this->jsfiles; } @@ -226,6 +233,8 @@ } return array( + 'external' => array(), + 'dynamic' => array(), array( $file ), ); } @@ -335,19 +344,6 @@ return $this->hasDoneOutput; } - function include_jquery_ui() { - global $prefs, $headerlib; - - if ($prefs['feature_jquery_ui'] != 'y') { - if ($prefs['feature_use_minified_scripts'] == 'y') { // could reduce to only using dialog (needs core, draggable & resizable) - $headerlib->add_jsfile('lib/jquery/jquery-ui/ui/minified/jquery-ui.min.js'); - } else { - $headerlib->add_jsfile('lib/jquery/jquery-ui/ui/jquery-ui.js'); - } - $headerlib->add_cssfile('lib/jquery/jquery-ui/themes/'.$prefs['feature_jquery_ui_theme'].'/jquery-ui.css'); - } - } - private function output_css_files() { $files = $this->collect_css_files(); Modified: trunk/lib/prefs/feature.php =================================================================== --- trunk/lib/prefs/feature.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/prefs/feature.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -576,13 +576,6 @@ 'help' => 'TikiTests', 'type' => 'flag', ), - 'feature_use_minified_scripts' => array( - 'name' => tra('Use Minified Scripts'), - 'description' => tra('These JavaScript files have been previously minified and are stable. They make pages quicker to load than their non-minified versions.'), - 'help' => 'MinifiedScripts', - 'type' => 'flag', - 'perspective' => false, - ), 'feature_version_checks' => array( 'name' => tra('Check for updates automatically'), 'description' => tra('TikiWiki will check for updates when you access the main Administration page'), Added: trunk/lib/prefs/javascript.php =================================================================== --- trunk/lib/prefs/javascript.php (rev 0) +++ trunk/lib/prefs/javascript.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -0,0 +1,16 @@ +<?php + +function prefs_javascript_list() { + return array( + 'javascript_cdn' => array( + 'name' => tra('Use CDN for Javascript'), + 'description' => tra('Obtain jQuery and jQuery UI libraries through a content delivery network.'), + 'type' => 'list', + 'options' => array( + 'none' => tra('None'), + 'google' => tra('Google'), + ), + ), + ); +} + Modified: trunk/lib/setup/js_detect.php =================================================================== --- trunk/lib/setup/js_detect.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/setup/js_detect.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -72,11 +72,7 @@ if (($fixondom = $prefs['iepngfix_elements']) != '') { $fixondom = "DD_belatedPNG.fixPng($fixondom); // list of HTMLDomElements to fix separated by commas (default is none)"; } - if ($prefs['feature_use_minified_scripts'] != 'n') { - $scriptpath = 'lib/iepngfix/DD_belatedPNG.js'; - } else { - $scriptpath = 'lib/iepngfix/DD_belatedPNG-min.js'; - } + $scriptpath = 'lib/iepngfix/DD_belatedPNG-min.js'; $headerlib->add_jsfile ($scriptpath, 200); $headerlib->add_js (<<<JS DD_belatedPNG.fix('$fixoncss'); // list of CSS selectors to fix separated by commas (default is set to fix sitelogo) Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/setup/prefs.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -1440,6 +1440,7 @@ 'wiki_3d_adjust_camera' => 'true', 'wiki_3d_autoload' => '', 'javascript_enabled' => 'n', + 'javascript_cdn' => 'none', 'feature_comments_post_as_anonymous' => 'n', 'feature_comments_moderation' => 'n', 'feature_comments_locking' => 'n', @@ -1535,7 +1536,6 @@ 'multidomain_active' => 'n', 'multidomain_config' => '', - 'feature_use_minified_scripts' => 'y', // for debugging 'tiki_minify_javascript' => 'y', 'tiki_minify_css' => 'y', 'tiki_minify_css_single_file' => 'n', Modified: trunk/lib/smarty_tiki/block.add_help.php =================================================================== --- trunk/lib/smarty_tiki/block.add_help.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/smarty_tiki/block.add_help.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -35,7 +35,6 @@ if (!isset($params['show']) or $params['show'] == 'y') { global $headerlib; - $headerlib->include_jquery_ui(); require_once $smarty->_get_plugin_filepath('block', 'self_link'); $self_link_params['_alt'] = tra('Click for Help'); $self_link_params['_icon'] = 'help'; Modified: trunk/lib/toolbars/toolbarslib.php =================================================================== --- trunk/lib/toolbars/toolbarslib.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/lib/toolbars/toolbarslib.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -1273,7 +1273,6 @@ global $headerlib; if( ! $dialogAdded ) { - $headerlib->include_jquery_ui(); $headerlib->add_js( <<<JS window.dialogData = []; var dialogDiv; Modified: trunk/templates/tiki-admin-include-performance.tpl =================================================================== --- trunk/templates/tiki-admin-include-performance.tpl 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/templates/tiki-admin-include-performance.tpl 2010-01-26 18:56:38 UTC (rev 24677) @@ -11,7 +11,7 @@ <fieldset> <legend>{tr}Performance{/tr}</legend> {preference name=tiki_minify_javascript} - {preference name=feature_use_minified_scripts} + {preference name=javascript_cdn} {preference name=tiki_minify_css} <div class="adminoptionboxchild" id="tiki_minify_css_childcontainer"> {preference name=tiki_minify_css_single_file} Modified: trunk/tiki-admin_toolbars.php =================================================================== --- trunk/tiki-admin_toolbars.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/tiki-admin_toolbars.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -27,15 +27,6 @@ die; } -if ($prefs['feature_jquery_ui'] != 'y') { - if ($prefs['feature_use_minified_scripts'] == 'y') { - $headerlib->add_jsfile('lib/jquery/jquery-ui/ui/minified/jquery-ui.min.js'); - } else { - $headerlib->add_jsfile('lib/jquery/jquery-ui/ui/jquery-ui.js'); - } - $headerlib->add_cssfile('lib/jquery/jquery-ui/themes/'.$prefs['feature_jquery_ui_theme'].'/jquery-ui.css'); -} - $sections = array( 'global', 'wiki page', 'trackers', 'blogs', 'calendar', 'cms', 'faqs', 'newsletters', 'forums', 'maps', 'admin'); if( isset($_REQUEST['section']) && in_array($_REQUEST['section'], $sections) ) { Modified: trunk/tiki-metrics.php =================================================================== --- trunk/tiki-metrics.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/tiki-metrics.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -44,13 +44,6 @@ $access->check_feature('feature_metrics_dashboard'); $metricslib = new MetricsLib($dbTiki); -// include JQueryUI and metrics css+js files -//$headerlib->add_cssfile("lib/jquery/jquery-ui/themes/{$prefs['feature_jquery_ui_theme']}/ui.tabs.css"); -$headerlib->add_cssfile("styles/metrics.css"); -$headerlib->add_jsfile("lib/jquery/jquery.sparkline.min.js"); -$headerlib->add_jsfile("lib/jquery/jquery-ui/ui/ui.core.js"); -$headerlib->add_jsfile("lib/jquery/jquery-ui/ui/ui.tabs.js"); -$headerlib->add_jsfile("lib/metrics.js"); $tabs = $metricslib->getAllTabs(); Modified: trunk/tiki-setup.php =================================================================== --- trunk/tiki-setup.php 2010-01-26 18:30:39 UTC (rev 24676) +++ trunk/tiki-setup.php 2010-01-26 18:56:38 UTC (rev 24677) @@ -142,11 +142,20 @@ if ($prefs['javascript_enabled'] == 'y') { - $headerlib->add_jsfile( 'lib/jquery/jquery.js' ); + if( $prefs['javascript_cdn'] == 'google' ) { + $headerlib->add_jsfile( 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js', 'external' ); + } else { + $headerlib->add_jsfile( 'lib/jquery/jquery.js' ); + } + $headerlib->add_jsfile( 'lib/jquery_tiki/tiki-jquery.js' ); if( $prefs['feature_jquery_ui'] == 'y' ) { - $headerlib->add_jsfile( 'lib/jquery/jquery-ui/ui/jquery-ui.js' ); + if( $prefs['javascript_cdn'] == 'google' ) { + $headerlib->add_jsfile( 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js', 'external' ); + } else { + $headerlib->add_jsfile( 'lib/jquery/jquery-ui/ui/jquery-ui.js' ); + } $headerlib->add_cssfile( 'lib/jquery/jquery-ui/themes/' . $prefs['feature_jquery_ui_theme'] . '/jquery-ui.css' ); } @@ -208,6 +217,12 @@ if( $prefs['wikiplugin_flash'] == 'y' ) { $headerlib->add_jsfile( 'lib/swfobject/swfobject.js' ); } + + if( $prefs['feature_metrics_dashboard'] == 'y' ) { + $headerlib->add_cssfile("styles/metrics.css"); + $headerlib->add_jsfile("lib/jquery/jquery.sparkline.min.js"); + $headerlib->add_jsfile("lib/metrics.js"); + } } // end if $prefs['javascript_enabled'] == 'y' if( session_id() ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |