Index: t3lib/class.t3lib_tceforms.php =================================================================== --- t3lib/class.t3lib_tceforms.php (revision 5215) +++ t3lib/class.t3lib_tceforms.php (working copy) @@ -2544,7 +2544,7 @@ if ($value['section']) { // Load script.aculo.us if flexform sections can be moved by drag'n'drop: - $this->loadJavascriptLib('contrib/scriptaculous/scriptaculous.js'); + $GLOBALS['SOBE']->doc->loadScriptaculous(); // Render header of section: $output.= '
'.$theTitle.'
'; @@ -5132,14 +5132,14 @@ $this->loadJavascriptLib('md5.js'); } - $this->loadJavascriptLib('contrib/prototype/prototype.js'); + $GLOBALS['SOBE']->doc->loadPrototype(); $this->loadJavascriptLib('../t3lib/jsfunc.evalfield.js'); // @TODO: Change to loadJavascriptLib(), but fix "TS = new typoScript()" issue first - see bug #9494 $jsFile[] = ''; // if IRRE fields were processed, add the JavaScript functions: if ($this->inline->inlineCount) { - $this->loadJavascriptLib('contrib/scriptaculous/scriptaculous.js'); + $GLOBALS['SOBE']->doc->loadScriptaculous(); $this->loadJavascriptLib('../t3lib/jsfunc.inline.js'); $out .= ' inline.setPrependFormFieldNames("'.$this->inline->prependNaming.'"); Index: typo3/alt_db_navframe.php =================================================================== --- typo3/alt_db_navframe.php (revision 5215) +++ typo3/alt_db_navframe.php (working copy) @@ -157,7 +157,7 @@ // Adding javascript code for AJAX (prototype), drag&drop and the pagetree as well as the click menu code $this->doc->getDragDropCode('pages'); $this->doc->getContextMenuCode(); - $this->doc->loadJavascriptLib('contrib/scriptaculous/scriptaculous.js?load=effects'); + $this->doc->loadScriptaculous('effects'); $this->doc->JScode .= $this->doc->wrapScriptTags( ($this->currentSubScript?'top.currentSubScript=unescape("'.rawurlencode($this->currentSubScript).'");':'').' Index: typo3/alt_doc.php =================================================================== --- typo3/alt_doc.php (revision 5215) +++ typo3/alt_doc.php (working copy) @@ -453,7 +453,7 @@ $this->doc->setModuleTemplate('templates/alt_doc.html'); $this->doc->form = '
'; - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->JScode = $this->doc->wrapScriptTags(' function jumpToUrl(URL,formEl) { // if (!TBE_EDITOR.isFormChanged()) { Index: typo3/class.browse_links.php =================================================================== --- typo3/class.browse_links.php (revision 5215) +++ typo3/class.browse_links.php (working copy) @@ -794,7 +794,7 @@ $this->doc = t3lib_div::makeInstance('template'); $this->doc->backPath = $GLOBALS['BACK_PATH']; // Load the Prototype library and browse_links.js - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->loadJavascriptLib('js/browse_links.js'); // init hook objects: Index: typo3/mod/web/perm/index.php =================================================================== --- typo3/mod/web/perm/index.php (revision 5215) +++ typo3/mod/web/perm/index.php (working copy) @@ -218,7 +218,7 @@ $this->doc->setModuleTemplate('templates/perm.html'); $this->doc->form = ''; $this->doc->loadJavascriptLib('../t3lib/jsfunc.updateform.js'); - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->loadJavascriptLib(TYPO3_MOD_PATH . 'perm.js'); // Setting up the context sensitive menu: Index: typo3/sysext/recycler/mod1/index.php =================================================================== --- typo3/sysext/recycler/mod1/index.php (revision 5215) +++ typo3/sysext/recycler/mod1/index.php (working copy) @@ -137,12 +137,9 @@ */ protected function loadHeaderData() { // Load CSS Stylesheets: - $this->loadStylesheet('contrib/extjs/resources/css/ext-all.css'); - $this->loadStylesheet('contrib/extjs/resources/css/xtheme-gray.css'); $this->loadStylesheet($this->relativePath . 'res/css/customExtJs.css'); // Load Ext JS: - $this->doc->loadJavascriptLib('contrib/extjs/adapter/ext/ext-base.js'); - $this->doc->loadJavascriptLib('contrib/extjs/ext-all.js'); + $this->doc->loadExtJS(); // Integrate dynamic JavaScript such as configuration or lables: $this->doc->JScode.= t3lib_div::wrapJS(' Ext.namespace("Recycler"); Index: typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php =================================================================== --- typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php (revision 5215) +++ typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php (working copy) @@ -230,7 +230,7 @@ $this->doc = t3lib_div::makeInstance('template'); $this->doc->backPath = $GLOBALS['BACK_PATH']; // Loading the Prototype library and browse_links.js - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->loadJavascriptLib('js/browse_links.js'); // Adding context menu code $this->doc->getContextMenuCode(); Index: typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php =================================================================== --- typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php (revision 5215) +++ typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php (working copy) @@ -183,7 +183,7 @@ $this->doc->backPath = $BACK_PATH; // Load the Prototype library and browse_links.js - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->loadJavascriptLib('js/browse_links.js'); $this->doc->getContextMenuCode(); Index: typo3/sysext/t3editor/class.tx_t3editor.php =================================================================== --- typo3/sysext/t3editor/class.tx_t3editor.php (revision 5215) +++ typo3/sysext/t3editor/class.tx_t3editor.php (working copy) @@ -125,8 +125,8 @@ $path_t3e = t3lib_extmgm::extRelPath('t3editor'); // include needed javascript-frameworks - $doc->loadJavascriptLib('contrib/prototype/prototype.js'); - $doc->loadJavascriptLib('contrib/scriptaculous/scriptaculous.js'); + $doc->loadPrototype(); + $doc->loadScriptaculous(); // include editor-css $code.= ''; $this->backPath = $this->doc->backPath = $BACK_PATH; - $this->doc->loadJavascriptLib('contrib/prototype/prototype.js'); + $this->doc->loadPrototype(); $this->doc->JScode = '