Bug #21078 ยป 0011985.patch

Administrator Admin, 2009-09-17 18:46

View differences:

tests/t3lib/t3lib_pagerenderer_testcase.php (Arbeitskopie)
24 24

  
25 25

  
26 26
/**
27
 * Testcase for the t3lib_pageIncludes class in the TYPO3 core.
27
 * Testcase for the t3lib_PageRenderer class in the TYPO3 core.
28 28
 *
29 29
 * @package TYPO3
30 30
 * @subpackage t3lib
......
33 33
 */
34 34
class t3lib_PageRenderer_testcase extends tx_phpunit_testcase {
35 35
	/**
36
	 * @var t3lib_pageIncludes
36
	 * @var t3lib_PageRenderer
37 37
	 */
38 38
	private $fixture;
39 39

  
40
	const PART_COMPLETE = 0;
41
	const PART_HEADER = 1;
42
	const PART_FOOTER = 2;
43

  
44 40
	public function setUp() {
45
		$className = 't3lib_PageRenderer_' . uniqid('test');
46
		eval('
47
			class ' . $className . ' extends t3lib_PageRenderer {
48
			}
49
		');
50
		$this->fixture = new $className();
41
		$this->fixture = new t3lib_PageRenderer();
51 42
	}
52 43

  
53 44
	public function tearDown() {
......
216 207
		
217 208
		$expectedReturnValue = '<tag method="private" name="test" />';
218 209
		$this->fixture->addFooterData('<tag method="private" name="test" />');
219
		$out = $this->fixture->render(self::PART_FOOTER);
210
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
220 211

  
221 212
		$this->assertContains(
222 213
			$expectedReturnValue,
......
249 240
		
250 241
		$expectedReturnValue = '<script src="fileadmin/test.js" type="text/javascript"></script>';
251 242
		$this->fixture->addJsFooterLibrary('test', 'fileadmin/test.js');
252
		$out = $this->fixture->render(self::PART_FOOTER);
243
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
253 244

  
254 245
		$this->assertContains(
255 246
			$expectedReturnValue,
......
281 272
		
282 273
		$expectedReturnValue = '<script src="fileadmin/test.js" type="text/javascript"></script>';
283 274
		$this->fixture->addJsFooterFile('fileadmin/test.js');
284
		$out = $this->fixture->render(self::PART_FOOTER);
275
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
285 276

  
286 277
		$this->assertContains(
287 278
			$expectedReturnValue,
......
313 304
		
314 305
		$expectedReturnValue = 'var x = "testvar"';
315 306
		$this->fixture->addJsFooterInlineCode('test', 'var x = "testvar"');
316
		$out = $this->fixture->render(self::PART_FOOTER);
307
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
317 308

  
318 309
		$this->assertContains(
319 310
			$expectedReturnValue,
......
502 493
		$this->fixture->loadExtJS();
503 494
		$this->fixture->addInlineLanguageLabel('myKey', 'myValue');
504 495
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
505
		$out = $this->fixture->render(self::PART_FOOTER);
496
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
506 497

  
507 498
		$this->assertContains(
508 499
			$expectedReturnValue,
......
520 511
		$this->fixture->loadExtJS();
521 512
		$this->fixture->addInlineLanguageLabelArray(array('myKey1' => 'myValue1', 'myKey2' => 'myValue2',));
522 513
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
523
		$out = $this->fixture->render(self::PART_FOOTER);
514
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
524 515

  
525 516
		$this->assertContains(
526 517
			$expectedReturnValue,
......
539 530
		$this->fixture->addInlineLanguageLabelArray(array('myKey1' => 'myValue1',));
540 531
		$this->fixture->addInlineLanguageLabelArray(array('myKey2' => 'myValue2',));
541 532
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
542
		$out = $this->fixture->render(self::PART_FOOTER);
533
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
543 534

  
544 535
		$this->assertContains(
545 536
			$expectedReturnValue,
......
557 548
		$this->fixture->loadExtJS();
558 549
		$this->fixture->addInlineSetting('myApp', 'myKey', 'myValue');
559 550
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
560
		$out = $this->fixture->render(self::PART_FOOTER);
551
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
561 552

  
562 553
		$this->assertContains(
563 554
			$expectedReturnValue,
......
575 566
		$this->fixture->loadExtJS();
576 567
		$this->fixture->addInlineSettingArray('myApp', array('myKey1' => 'myValue1', 'myKey2' => 'myValue2',));
577 568
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
578
		$out = $this->fixture->render(self::PART_FOOTER);
569
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
579 570

  
580 571
		$this->assertContains(
581 572
			$expectedReturnValue,
......
594 585
		$this->fixture->addInlineSettingArray('myApp', array('myKey1' => 'myValue1',));
595 586
		$this->fixture->addInlineSettingArray('myApp', array('myKey2' => 'myValue2',));
596 587
		$out = $this->fixture->enableMoveJsFromHeaderToFooter();
597
		$out = $this->fixture->render(self::PART_FOOTER);
588
		$out = $this->fixture->render(t3lib_PageRenderer::PART_FOOTER);
598 589

  
599 590
		$this->assertContains(
600 591
			$expectedReturnValue,
t3lib/class.t3lib_tceforms.php (Arbeitskopie)
5244 5244
				$this->loadJavascriptLib('md5.js');
5245 5245
			}
5246 5246

  
5247
			$GLOBALS['SOBE']->doc->loadPrototype();
5248
			$GLOBALS['SOBE']->doc->loadExtJS();
5247
			/** @var $pageRenderer t3lib_PageRenderer */
5248
			$pageRenderer = $GLOBALS['SOBE']->doc->getPageRenderer();
5249
			$pageRenderer->loadPrototype();
5250
			$pageRenderer->loadExtJS();
5249 5251

  
5250 5252
				// make textareas resizable and flexible
5251 5253
			if (!($GLOBALS['BE_USER']->uc['resizeTextareas'] == '0' && $GLOBALS['BE_USER']->uc['resizeTextareas_Flexible'] == '0')) {
......
5257 5259
				'textareaFlexible' => (!$GLOBALS['BE_USER']->uc['resizeTextareas_Flexible'] == '0'),
5258 5260
				'textareaResize' => (!$GLOBALS['BE_USER']->uc['resizeTextareas'] == '0'),
5259 5261
			);
5260
			$GLOBALS['SOBE']->doc->addInlineSettingArray('', $resizableSettings);
5262
			$pageRenderer->addInlineSettingArray('', $resizableSettings);
5261 5263

  
5262 5264
			$this->loadJavascriptLib('../t3lib/jsfunc.evalfield.js');
5263 5265

  
......
5270 5272
				'dateFormat'       => array('j-n-Y', 'G:i j-n-Y'),
5271 5273
				'dateFormatUS'     => array('n-j-Y', 'G:i n-j-Y'),
5272 5274
			);
5273
			$GLOBALS['SOBE']->doc->addInlineSettingArray('', $typo3Settings);
5275
			$pageRenderer->addInlineSettingArray('', $typo3Settings);
5274 5276

  
5275 5277
			$this->loadJavascriptLib('../t3lib/js/extjs/tceforms.js');
5276 5278

  
......
5286 5288

  
5287 5289
				// if Suggest fields were processed, add the JS functions
5288 5290
			if ($this->suggest->suggestCount > 0) {
5289
				$GLOBALS['SOBE']->doc->loadScriptaculous();
5291
				$pageRenderer->loadScriptaculous();
5290 5292
				$this->loadJavascriptLib('../t3lib/js/jsfunc.tceforms_suggest.js');
5291 5293
			}
5292 5294

  
t3lib/class.t3lib_pagerenderer.php (Arbeitskopie)
34 34
 * @subpackage t3lib
35 35
 * $Id$
36 36
 */
37
abstract class t3lib_PageRenderer implements t3lib_Singleton {
37
class t3lib_PageRenderer implements t3lib_Singleton {
38 38
	
39 39
	protected $compressJavascript = FALSE;
40 40
	protected $compressCss = FALSE;
typo3/class.browse_links.php (Arbeitskopie)
772 772
		$this->doc = t3lib_div::makeInstance('template');
773 773
		$this->doc->backPath = $GLOBALS['BACK_PATH'];
774 774
			// Load the Prototype library and browse_links.js
775
		$this->doc->loadPrototype();
775
		$this->doc->getPageRenderer()->loadPrototype();
776 776
		$this->doc->loadJavascriptLib('js/browse_links.js');
777 777

  
778 778
			// init hook objects:
typo3/file_list.php (Arbeitskopie)
165 165
		$this->doc = t3lib_div::makeInstance('template');
166 166
		$this->doc->backPath = $BACK_PATH;
167 167
		$this->doc->setModuleTemplate('templates/file_list.html');
168
		$this->doc->loadPrototype();
168
		$this->doc->getPageRenderer()->loadPrototype();
169 169

  
170 170
			// Validating the input "id" (the path, directory!) and checking it against the mounts of the user.
171 171
		$this->id = $this->basicFF->is_directory($this->id);
typo3/template.php (Arbeitskopie)
156 156
 * @package TYPO3
157 157
 * @subpackage core
158 158
 */
159
class template extends t3lib_PageRenderer {
159
class template {
160 160

  
161 161
		// Vars you typically might want to/should set from outside after making instance of this class:
162 162
	var $backPath = '';				// 'backPath' pointing back to the PATH_typo3
......
209 209

  
210 210
	var $hasDocheader = true;
211 211

  
212
    	// class for render the header / footer
212
	/**
213
	 * @var t3lib_PageRenderer
214
	 */
215
	protected $pageRenderer;
216
	protected $pageHeaderFooterTemplateFile = '';	// alternative template file
213 217

  
214
    var $pageHeaderFooterTemplateFile = '';	// alternative template file
215 218

  
216

  
217 219
	/**
218 220
	 * Constructor
219 221
	 * Imports relevant parts from global $TBE_STYLES (colorscheme)
......
222 224
	 */
223 225
	function template()	{
224 226
		global $TBE_STYLES;
225
		parent::__construct(TYPO3_mainDir . 'templates/template_page_backend.html');
226 227

  
228
			// Initializes the page rendering object:
229
		$this->getPageRenderer();
230

  
227 231
			// Setting default scriptID:
228 232
		if (($temp_M = (string) t3lib_div::_GET('M')) && $GLOBALS['TBE_MODULES']['_PATHS'][$temp_M]) {
229 233
			$this->scriptID = preg_replace('/^.*\/(sysext|ext)\//', 'ext/', $GLOBALS['TBE_MODULES']['_PATHS'][$temp_M] . 'index.php');
......
264 268
	}
265 269

  
266 270

  
271
	/**
272
	 * Gets instance of PageRenderer
273
	 * 
274
	 * @return	t3lib_PageRenderer
275
	 */
276
	public function getPageRenderer() {
277
		if (!isset($this->pageRenderer)) {
278
			$this->pageRenderer = t3lib_div::makeInstance('t3lib_PageRenderer');
279
			$this->pageRenderer->setTemplateFile(
280
				TYPO3_mainDir . 'templates/template_page_backend.html'
281
			);
282
		}
283
		return $this->pageRenderer;
284
	}
267 285

  
268 286

  
269 287

  
......
277 295

  
278 296

  
279 297

  
280

  
281 298
	/*****************************************
282 299
	 *
283 300
	 * EVALUATION FUNCTIONS
......
623 640
			}
624 641
		}
625 642

  
643
		$this->pageRenderer->backPath = $this->backPath;
644

  
626 645
			// alternative template for Header and Footer
627 646
		if ($this->pageHeaderFooterTemplateFile) {
628 647
			$file =  t3lib_div::getFileAbsFileName($this->pageHeaderFooterTemplateFile, TRUE);
629 648
			if ($file) {
630
				$this->setAlternativeTemplateFile($file);
649
				$this->pageRenderer->setTemplateFile($file);
631 650
			}
632 651
		}
633 652
			// For debugging: If this outputs "QuirksMode"/"BackCompat" (IE) the browser runs in quirks-mode. Otherwise the value is "CSS1Compat"
......
638 657
		header ('Content-Type:text/html;charset='.$this->charset);
639 658

  
640 659
			// Standard HTML tag
641
		$this->setHtmlTag('<html xmlns="http://www.w3.org/1999/xhtml">');
660
		$this->pageRenderer->setHtmlTag('<html xmlns="http://www.w3.org/1999/xhtml">');
642 661

  
643 662
		switch($this->docType)	{
644 663
			case 'html_3':
......
693 712
			}
694 713
		}
695 714

  
696
		$this->setXmlPrologAndDocType($headerStart);
697
		$this->setHeadTag('<head>' . chr(10). '<!-- TYPO3 Script ID: '.htmlspecialchars($this->scriptID).' -->');
698
		$this->setCharSet($this->charset);	
699
		$this->addMetaTag($this->generator());	
700
		$this->setTitle($title);
715
		$this->pageRenderer->setXmlPrologAndDocType($headerStart);
716
		$this->pageRenderer->setHeadTag('<head>' . chr(10). '<!-- TYPO3 Script ID: '.htmlspecialchars($this->scriptID).' -->');
717
		$this->pageRenderer->setCharSet($this->charset);
718
		$this->pageRenderer->addMetaTag($this->generator());
719
		$this->pageRenderer->setTitle($title);
701 720
		
702 721
		// add docstyles
703 722
		$this->docStyle();
704 723

  
705 724

  
706 725
		// add jsCode - has to go to headerData as it may contain the script tags already
707
		$this->addHeaderData($this->JScode);
726
		$this->pageRenderer->addHeaderData($this->JScode);
708 727
		
709 728
		foreach ($this->JScodeArray as $name => $code) {
710
			$this->addJsInlineCode($name, $code);	
729
			$this->pageRenderer->addJsInlineCode($name, $code);	
711 730
		}
712 731

  
713 732
		if (count($this->JScodeLibArray)) {
714 733
			foreach($this->JScodeLibArray as $library) {
715
				$this->addHeaderData($library);
734
				$this->pageRenderer->addHeaderData($library);
716 735
			}
717 736
		}
718 737

  
719 738
		if ($this->extJScode) {
720
			$this->addJsHandlerCode($this->extJScode, t3lib_pageIncludes::JSHANDLER_EXTONREADY);
739
			$this->pageRenderer->addExtOnReadyCode($this->extJScode);
721 740
		}
722 741

  
723 742
			// Construct page header.
724
		$str = $this->render(1);
743
		$str = $this->pageRenderer->render(t3lib_PageRenderer::PART_HEADER);
725 744

  
726 745
		$this->JScodeLibArray = array();
727 746
		$this->JScode = $this->extJScode = '';
728 747
		$this->JScodeArray = array();
729 748

  
730
		$this->endOfPageJsBlock = $this->render(2);
749
		$this->endOfPageJsBlock = $this->pageRenderer->render(t3lib_PageRenderer::PART_FOOTER);
731 750
		
732 751
		if ($this->docType=='xhtml_frames')	{
733 752
			return $str;
......
968 987
		$inDocStyles = implode(chr(10), $this->inDocStylesArray);
969 988

  
970 989
		if ($this->styleSheetFile) {
971
		   $this->addCssFile($this->backPath . $this->styleSheetFile);					
990
			$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile);
972 991
		}
973 992
		if ($this->styleSheetFile2) {
974
			$this->addCssFile($this->backPath . $this->styleSheetFile2);					
993
			$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile2);
975 994
		}
976 995

  
977
		$this->addCssInlineBlock('inDocStyles', $inDocStyles . chr(10) . '/*###POSTCSSMARKER###*/');
996
		$this->pageRenderer->addCssInlineBlock('inDocStyles', $inDocStyles . chr(10) . '/*###POSTCSSMARKER###*/');
978 997
		if ($this->styleSheetFile_post) {
979
			$this->addCssFile($this->backPath . $this->styleSheetFile_post);
998
			$this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile_post);
980 999
	}
981 1000

  
982 1001
	}
......
991 1010
	 * @return	void
992 1011
	 */
993 1012
	function addStyleSheet($key, $href, $title='', $relation='stylesheet') {
994
		$this->addCssFile($this->backPath . $href, $relation, $title);
1013
		$this->pageRenderer->addCssFile($this->backPath . $href, $relation, $title);
995 1014
		}
996 1015

  
997 1016
	/**
......
1318 1337
	 * @return	void
1319 1338
	 */
1320 1339
	function loadJavascriptLib($lib)	{
1321
		$this->addJsFile($this->backPath . $lib);
1322
		}
1340
		$this->pageRenderer->addJsFile($this->backPath . $lib);
1341
	}
1323 1342

  
1324 1343

  
1325 1344

  
......
1330 1349
	 *			Please just call this function without expecting a return value for future calls
1331 1350
	 */
1332 1351
	function getContextMenuCode()   {
1333
	       $this->loadPrototype();
1352
	       $this->pageRenderer->loadPrototype();
1334 1353
	       $this->loadJavascriptLib('js/clickmenu.js');
1335 1354

  
1336 1355
	       $this->JScodeArray['clickmenu'] = '
......
1349 1368
	 * @return	array		If values are present: [0] = A <script> section for the HTML page header, [1] = onmousemove/onload handler for HTML tag or alike, [2] = One empty <div> layer for the follow-mouse drag element
1350 1369
	 */
1351 1370
	function getDragDropCode($table)	{
1352
		$this->loadPrototype();
1371
		$this->pageRenderer->loadPrototype();
1353 1372
		$this->loadJavascriptLib('js/common.js');
1354 1373
		$this->loadJavascriptLib('js/tree.js');
1355 1374

  
......
1893 1912
	 */
1894 1913
	function setModuleTemplate($filename) {
1895 1914
			// Load Prototype lib for IE event
1896
		$this->loadPrototype();
1915
		$this->pageRenderer->loadPrototype();
1897 1916
		$this->loadJavascriptLib('js/iecompatibility.js');
1898 1917
		$this->moduleTemplate = $this->getHtmlTemplate($filename);
1899 1918
	}
typo3/backend.php (Arbeitskopie)
204 204
		/******************************************************
205 205
		 * now put the complete backend document together
206 206
		 ******************************************************/
207

  
208
		$GLOBALS['TBE_TEMPLATE']->loadScriptaculous('builder,effects,controls,dragdrop');
209
		$GLOBALS['TBE_TEMPLATE']->loadExtJS();
207
		$pageRenderer = $GLOBALS['TBE_TEMPLATE']->getPageRenderer();
208
		$pageRenderer->loadScriptaculous('builder,effects,controls,dragdrop');
209
		$pageRenderer->loadExtJS();
210 210
		
211 211
			// remove duplicate entries
212 212
		$this->jsFiles = array_unique($this->jsFiles);
typo3/alt_db_navframe.php (Arbeitskopie)
157 157
			// Adding javascript code for AJAX (prototype), drag&drop and the pagetree as well as the click menu code
158 158
		$this->doc->getDragDropCode('pages');
159 159
		$this->doc->getContextMenuCode();
160
		$this->doc->loadScriptaculous('effects');
160
		$this->doc->getPageRenderer()->loadScriptaculous('effects');
161 161

  
162 162
		$this->doc->JScode .= $this->doc->wrapScriptTags(
163 163
		($this->currentSubScript?'top.currentSubScript=unescape("'.rawurlencode($this->currentSubScript).'");':'').'
typo3/alt_doc.php (Arbeitskopie)
446 446
		$this->doc->setModuleTemplate('templates/alt_doc.html');
447 447
		$this->doc->form = '<form action="'.htmlspecialchars($this->R_URI).'" method="post" enctype="'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['form_enctype'].'" name="editform" onsubmit="document.editform._scrollPosition.value=(document.documentElement.scrollTop || document.body.scrollTop); return TBE_EDITOR.checkSubmit(1);">';
448 448

  
449
		$this->doc->loadPrototype();
449
		$this->doc->getPageRenderer()->loadPrototype();
450 450
		$this->doc->JScode = $this->doc->wrapScriptTags('
451 451
			function jumpToUrl(URL,formEl)	{	//
452 452
				if (!TBE_EDITOR.isFormChanged())	{
typo3/mod/web/perm/index.php (Arbeitskopie)
215 215
		$this->doc->setModuleTemplate('templates/perm.html');
216 216
		$this->doc->form = '<form action="'.$GLOBALS['BACK_PATH'].'tce_db.php" method="post" name="editform">';
217 217
		$this->doc->loadJavascriptLib('../t3lib/jsfunc.updateform.js');
218
		$this->doc->loadPrototype();
218
		$this->doc->getPageRenderer()->loadPrototype();
219 219
		$this->doc->loadJavascriptLib(TYPO3_MOD_PATH . 'perm.js');
220 220

  
221 221
			// Setting up the context sensitive menu:
typo3/sysext/t3editor/class.tx_t3editor.php (Arbeitskopie)
128 128
			$path_t3e = t3lib_extmgm::extRelPath('t3editor');
129 129

  
130 130
				// include needed javascript-frameworks
131
			$doc->loadPrototype();
132
			$doc->loadScriptaculous();
131
			/** @var $pageRenderer t3lib_PageRenderer */
132
			$pageRenderer = $doc->getPageRenderer();
133
			$pageRenderer->loadPrototype();
134
			$pageRenderer->loadScriptaculous();
133 135

  
134 136
				// include editor-css
135 137
			$code.= '<link href="' .
typo3/sysext/taskcenter/task/index.php (Arbeitskopie)
92 92
		$this->doc->divClass = '';
93 93
		$this->doc->form = '<form action="index.php" method="post" name="editform">';
94 94
		$this->backPath = $this->doc->backPath = $BACK_PATH;
95
		$this->doc->loadPrototype();
95
		$this->doc->getPageRenderer()->loadPrototype();
96 96
		$this->doc->JScode = '  <script language="javascript" type="text/javascript">
97 97
			script_ended = 0;
98 98
			function jumpToUrl(URL) {
typo3/sysext/cms/tslib/class.tslib_fe.php (Arbeitskopie)
190 190
 * @package TYPO3
191 191
 * @subpackage tslib
192 192
 */
193
 class tslib_fe extends t3lib_PageRenderer {
193
 class tslib_fe {
194 194

  
195 195
		// CURRENT PAGE:
196 196
	var $id='';							// The page id (int)
......
397 397
	var $pages_lockObj;					// Locking object for accessing "cache_pages"
398 398

  
399 399
	/**
400
	 * @var t3lib_PageRenderer
401
	 */
402
	protected $pageRenderer;
403

  
404
	/**
400 405
	 * the page cache object, use this to save pages to the cache and to
401 406
	 * retrieve them again
402 407
	 *
......
457 462
		}
458 463

  
459 464
		$this->initCaches();
460
		parent::__construct(PATH_tslib . 'templates/tslib_page_frontend.html');
461 465
	}
462 466

  
463 467
	/**
......
546 550
		}
547 551
	}
548 552

  
553
	/**
554
	 * Gets instance of PageRenderer
555
	 * 
556
	 * @return	t3lib_PageRenderer
557
	 */
558
	public function getPageRenderer() {
559
		if (!isset($this->pageRenderer)) {
560
			$this->pageRenderer = t3lib_div::makeInstance('t3lib_PageRenderer');
561
			$this->pageRenderer->setTemplateFile(PATH_tslib . 'templates/tslib_page_frontend.html');
562
		}
563
		return $this->pageRenderer;
564
	}
549 565

  
550 566

  
551 567

  
......
562 578

  
563 579

  
564 580

  
565

  
566 581
	/********************************************
567 582
	 *
568 583
	 * Initializing, resolving page id
typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
338 338
	 * @return	void
339 339
	 */
340 340
	public static function renderContentWithHeader($pageContent) {
341
			// get instance of t3lib_PageRenderer
342
		/** @var $pageRenderer t3lib_PageRenderer */
343
		$pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
341 344
		
342
		$GLOBALS['TSFE']->backPath = 'typo3/';
345
		$pageRenderer->backPath = 'typo3/';
343 346
		
344 347
		if ($GLOBALS['TSFE']->config['config']['moveJsFromHeaderToFooter']) {
345
			$GLOBALS['TSFE']->enableMoveJsFromHeaderToFooter();
348
			$pageRenderer->enableMoveJsFromHeaderToFooter();
346 349
		}
347 350

  
348 351
		if ($GLOBALS['TSFE']->config['config']['pageRenderTemplateFile']) {
349 352
			$file = $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->config['config']['pageRenderTemplateFile']);
350 353
			if ($file) {
351
				$GLOBALS['TSFE']->setTemplateFile($file);
354
				$pageRenderer->setTemplateFile($file);
352 355
			}
353 356
		}
354 357

  
355 358
		$customContent = $GLOBALS['TSFE']->config['config']['headerComment'];
356 359
		if (trim($customContent)) {
357
			$GLOBALS['TSFE']->addInlineComment($customContent);
360
			$pageRenderer->addInlineComment($customContent);
358 361
		}
359 362

  
360 363
			// Setting charset:
......
449 452

  
450 453
			// Adding doctype parts:
451 454
		if (count($docTypeParts)) {
452
			$GLOBALS['TSFE']->setXmlPrologAndDocType(implode(chr(10), $docTypeParts));
455
			$pageRenderer->setXmlPrologAndDocType(implode(chr(10), $docTypeParts));
453 456
		}
454 457

  
455 458
			// Begin header section:
......
458 461
		} else {
459 462
			$_attr = '';
460 463
		}
461
		$GLOBALS['TSFE']->setHtmlTag('<html' . ($_attr ? ' ' . $_attr : '') . '>');
464
		$pageRenderer->setHtmlTag('<html' . ($_attr ? ' ' . $_attr : '') . '>');
462 465

  
463 466
			// Head tag:
464 467
		$headTag = $GLOBALS['TSFE']->pSetup['headTag'] ? $GLOBALS['TSFE']->pSetup['headTag'] : '<head>';
465
		$GLOBALS['TSFE']->setHeadTag($headTag);
468
		$pageRenderer->setHeadTag($headTag);
466 469

  
467 470
			// Setting charset meta tag:
468
		$GLOBALS['TSFE']->setCharSet($theCharset);
471
		$pageRenderer->setCharSet($theCharset);
469 472

  
470
		$GLOBALS['TSFE']->addInlineComment('
473
		$pageRenderer->addInlineComment('
471 474
	This website is powered by TYPO3 - inspiring people to share!
472 475
	TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
473 476
	TYPO3 is copyright 1998-2009 of Kasper Skaarhoj. Extensions are copyright of their respective owners.
......
475 478
');
476 479

  
477 480
		if ($GLOBALS['TSFE']->baseUrl) {
478
			$GLOBALS['TSFE']->setBaseUrl($GLOBALS['TSFE']->baseUrl);
481
			$pageRenderer->setBaseUrl($GLOBALS['TSFE']->baseUrl);
479 482
		}
480 483

  
481 484
		if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
......
485 488
				if (($finfo = @finfo_open(FILEINFO_MIME))) {
486 489
					$iconMimeType = ' type="' . finfo_file($finfo, $favIcon) . '"';
487 490
					finfo_close($finfo);
488
					$GLOBALS['TSFE']->setIconMimeType($iconMimeType);
491
					$pageRenderer->setIconMimeType($iconMimeType);
489 492
				}
490 493
			}
491
			$GLOBALS['TSFE']->setFavIcon($favIcon);
494
			$pageRenderer->setFavIcon($favIcon);
492 495
		
493 496
		}
494 497

  
......
502 505
			}
503 506
			if (count($temp_styleLines)) {
504 507
				if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
505
					$GLOBALS['TSFE']->addCssFile(TSpagegen::inline2TempFile(implode(chr(10), $temp_styleLines), 'css'));
508
					$pageRenderer->addCssFile(TSpagegen::inline2TempFile(implode(chr(10), $temp_styleLines), 'css'));
506 509
				} else {
507
					$GLOBALS['TSFE']->addCssInlineBlock('TSFEinlineStyle', implode(chr(10), $temp_styleLines));
510
					$pageRenderer->addCssInlineBlock('TSFEinlineStyle', implode(chr(10), $temp_styleLines));
508 511
				}
509 512
			}
510 513
		}
......
512 515
		if ($GLOBALS['TSFE']->pSetup['stylesheet']) {
513 516
			$ss = $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['stylesheet']);
514 517
			if ($ss) {
515
				$GLOBALS['TSFE']->addCssFile($ss);
518
				$pageRenderer->addCssFile($ss);
516 519
			}
517 520
		}
518 521

  
......
532 535
							if (! $GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['external'] && substr($ss, 0, 1) != '/') { // To fix MSIE 6 that cannot handle these as relative paths (according to Ben v Ende)
533 536
								$ss = t3lib_div::dirname(t3lib_div::getIndpEnv('SCRIPT_NAME')) . '/' . $ss;
534 537
							}
535
							$GLOBALS['TSFE']->addCssInlineBlock(
538
							$pageRenderer->addCssInlineBlock(
536 539
								'import_' . $key, 
537 540
								'@import url("' . htmlspecialchars($ss) . '") ' . htmlspecialchars($GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['media']) . ';', 
538 541
								$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['compressed'] ? TRUE : FALSE, 
......
540 543
								''
541 544
							);
542 545
						} else {
543
							$GLOBALS['TSFE']->addCssFile(
546
							$pageRenderer->addCssFile(
544 547
								htmlspecialchars($ss), 
545 548
								$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['alternate'] ? 'alternate stylesheet' : 'stylesheet',
546 549
								$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['media'] ? $GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['media'] : 'screen', 
......
631 634

  
632 635
		if (trim($style)) {
633 636
			if ($GLOBALS['TSFE']->config['config']['inlineStyle2TempFile']) {
634
				$GLOBALS['TSFE']->addCssFile(TSpagegen::inline2TempFile($style, 'css'));
637
				$pageRenderer->addCssFile(TSpagegen::inline2TempFile($style, 'css'));
635 638
			} else {
636
				$GLOBALS['TSFE']->addCssInlineBlock('additionalTSFEInlineStyle', $style);
639
				$pageRenderer->addCssInlineBlock('additionalTSFEInlineStyle', $style);
637 640
			}
638 641
		}
639 642

  
640 643
			// Javascript Libraries
641 644
		if (is_array($GLOBALS['TSFE']->pSetup['javascriptLibs.'])) {
642 645
			if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['Prototype']) {
643
				$GLOBALS['TSFE']->loadPrototype();
646
				$pageRenderer->loadPrototype();
644 647
			}
645 648
			if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['Scriptaculous']) {
646 649
				$modules = $GLOBALS['TSFE']->pSetup['javascriptLibs.']['Scriptaculous.']['modules'] ? $GLOBALS['TSFE']->pSetup['javascriptLibs.']['Scriptaculous.']['modules'] : '';
647
				$GLOBALS['TSFE']->loadScriptaculous($modules);
650
				$pageRenderer->loadScriptaculous($modules);
648 651
			}
649 652
			if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtCore']) {
650
				$GLOBALS['TSFE']->loadExtCore();
653
				$pageRenderer->loadExtCore();
651 654
				if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtCore.']['debug']) {
652
					$GLOBALS['TSFE']->enableExtCoreDebug();
655
					$pageRenderer->enableExtCoreDebug();
653 656
				}
654 657
			}
655 658
			if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs']) {
656 659
				$css = $GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['css'] ? TRUE : FALSE;
657 660
				$theme = $GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['theme'] ? TRUE : FALSE;
658 661
				$adapter = $GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['adapter'] ? $GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['adapter'] : '';
659
				$GLOBALS['TSFE']->loadExtJs($css, $theme, $adapter);
662
				$pageRenderer->loadExtJs($css, $theme, $adapter);
660 663
				if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['debug']) {
661
					$GLOBALS['TSFE']->enableExtJsDebug();
664
					$pageRenderer->enableExtJsDebug();
662 665
				}
663 666
				if ($GLOBALS['TSFE']->pSetup['javascriptLibs.']['ExtJs.']['quickTips']) {
664
					$GLOBALS['TSFE']->enableExtJSQuickTips();
667
					$pageRenderer->enableExtJSQuickTips();
665 668
				}
666 669
			}
667 670
		}
......
675 678
					if (! $type) {
676 679
						$type = 'text/javascript';
677 680
					}
678
					$GLOBALS['TSFE']->addJsLibrary(
681
					$pageRenderer->addJsLibrary(
679 682
						htmlspecialchars($key), 
680 683
						htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss), 
681 684
						htmlspecialchars($type), 
......
696 699
					if (! $type) {
697 700
						$type = 'text/javascript';
698 701
					}
699
					$GLOBALS['TSFE']->addJsFooterLibrary(
702
					$pageRenderer->addJsFooterLibrary(
700 703
						htmlspecialchars($key), 
701 704
						htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss), 
702 705
						htmlspecialchars($type), 
......
719 722
						if (! $type) {
720 723
							$type = 'text/javascript';
721 724
						}
722
						$GLOBALS['TSFE']->addJsFile(
725
						$pageRenderer->addJsFile(
723 726
							htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss), 
724 727
							htmlspecialchars($type), 
725 728
							$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['compressed'] ? TRUE : FALSE, 
......
740 743
						if (! $type) {
741 744
							$type = 'text/javascript';
742 745
						}
743
						$GLOBALS['TSFE']->addJsFooterFile(
746
						$pageRenderer->addJsFooterFile(
744 747
							htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss), 
745 748
							htmlspecialchars($type), 
746 749
							$GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['compressed'] ? TRUE : FALSE, 
......
754 757

  
755 758
			// Headerdata
756 759
		if (is_array($GLOBALS['TSFE']->pSetup['headerData.'])) {
757
			$GLOBALS['TSFE']->addHeaderData($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['headerData.'], 'headerData.'));
760
			$pageRenderer->addHeaderData($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['headerData.'], 'headerData.'));
758 761
		}
759 762

  
760 763
			// Footerdata
761 764
		if (is_array($GLOBALS['TSFE']->pSetup['footerData.'])) {
762
			$GLOBALS['TSFE']->addFooterData($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['footerData.'], 'footerData.'));
765
			$pageRenderer->addFooterData($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['footerData.'], 'footerData.'));
763 766
		}
764 767

  
765 768
			// Title
......
769 772
		}
770 773

  
771 774
		if (strlen($titleTagContent) && intval($GLOBALS['TSFE']->config['config']['noPageTitle']) !== 2) {
772
			$GLOBALS['TSFE']->setTitle($titleTagContent);
775
			$pageRenderer->setTitle($titleTagContent);
773 776
		}
774 777

  
775
		$GLOBALS['TSFE']->addMetaTag('<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS" />');
778
		$pageRenderer->addMetaTag('<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS" />');
776 779

  
777 780
		$conf = $GLOBALS['TSFE']->pSetup['meta.'];
778 781
		if (is_array($conf)) {
......
788 791
						if (strtolower($key) == 'refresh') {
789 792
							$a = 'http-equiv';
790 793
						}
791
						$GLOBALS['TSFE']->addMetaTag('<meta ' . $a . '="' . $key . '" content="' . htmlspecialchars(trim($val)) . '" />');
794
						$pageRenderer->addMetaTag('<meta ' . $a . '="' . $key . '" content="' . htmlspecialchars(trim($val)) . '" />');
792 795
					}
793 796
				}
794 797
			}
......
888 891

  
889 892
			// Should minify?
890 893
		if ($GLOBALS['TSFE']->config['config']['minifyJS']) {
891
			$GLOBALS['TSFE']->enableCompressJavascript();
894
			$pageRenderer->enableCompressJavascript();
892 895
			$minifyErrorScript = $minifyErrorInline = '';
893 896
			$scriptJsCode = t3lib_div::minifyJavaScript($scriptJsCode, $minifyErrorScript);
894 897
			if ($minifyErrorScript) {
......
912 915
		if (! $GLOBALS['TSFE']->config['config']['removeDefaultJS']) {
913 916
				// inlude default and inlineJS
914 917
			if ($scriptJsCode) {
915
				$GLOBALS['TSFE']->addJsInlineCode('_scriptCode', $scriptJsCode, $GLOBALS['TSFE']->config['config']['minifyJS']);
918
				$pageRenderer->addJsInlineCode('_scriptCode', $scriptJsCode, $GLOBALS['TSFE']->config['config']['minifyJS']);
916 919
			}
917 920
			if ($inlineJS) {
918
				$GLOBALS['TSFE']->addJsInlineCode('TS_inlineJS', $inlineJS, $GLOBALS['TSFE']->config['config']['minifyJS']);
921
				$pageRenderer->addJsInlineCode('TS_inlineJS', $inlineJS, $GLOBALS['TSFE']->config['config']['minifyJS']);
919 922
			}
920 923
			if ($inlineFooterJs) {
921
				$GLOBALS['TSFE']->addJsFooterInlineCode('TS_inlineFooter', $inlineFooterJs, $GLOBALS['TSFE']->config['config']['minifyJS']);
924
				$pageRenderer->addJsFooterInlineCode('TS_inlineFooter', $inlineFooterJs, $GLOBALS['TSFE']->config['config']['minifyJS']);
922 925
			}
923 926
		} elseif ($GLOBALS['TSFE']->config['config']['removeDefaultJS'] === 'external') {
924 927
				// put default and inlineJS in external file
925
			$GLOBALS['TSFE']->addJsFile(TSpagegen::inline2TempFile($scriptJsCode . $inlineJS, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
928
			$pageRenderer->addJsFile(TSpagegen::inline2TempFile($scriptJsCode . $inlineJS, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
926 929
			if ($inlineFooterJs) {
927
				$GLOBALS['TSFE']->addJsFooterFile(TSpagegen::inline2TempFile($inlineFooterJs, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
930
				$pageRenderer->addJsFooterFile(TSpagegen::inline2TempFile($inlineFooterJs, 'js'), 'text/javascript', $GLOBALS['TSFE']->config['config']['minifyJS']);
928 931
			}
929 932
		} else {
930 933
				// include only inlineJS
931 934
			if ($inlineJS) {
932
				$GLOBALS['TSFE']->addJsInlineCode('TS_inlineJS', $inlineJS, $GLOBALS['TSFE']->config['config']['minifyJS']);
935
				$pageRenderer->addJsInlineCode('TS_inlineJS', $inlineJS, $GLOBALS['TSFE']->config['config']['minifyJS']);
933 936
			}
934 937
			if ($inlineFooterJs) {
935
				$GLOBALS['TSFE']->addJsFooterInlineCode('TS_inlineFooter', $inlineFooterJs, $GLOBALS['TSFE']->config['config']['minifyJS']);
938
				$pageRenderer->addJsFooterInlineCode('TS_inlineFooter', $inlineFooterJs, $GLOBALS['TSFE']->config['config']['minifyJS']);
936 939
			}
937 940
		}
938 941

  
939 942
			// ExtJS specific code
940 943
		if (is_array($GLOBALS['TSFE']->pSetup['inlineLanguageLabel.'])) {
941
			$GLOBALS['TSFE']->addInlineLanguageLabelArray($GLOBALS['TSFE']->pSetup['inlineLanguageLabel.']);		
944
			$pageRenderer->addInlineLanguageLabelArray($GLOBALS['TSFE']->pSetup['inlineLanguageLabel.']);
942 945
		} 
943 946

  
944 947
		if (is_array($GLOBALS['TSFE']->pSetup['inlineSettings.'])) {
945
			$GLOBALS['TSFE']->addInlineSettingArray('TS', $GLOBALS['TSFE']->pSetup['inlineSettings.']);		
948
			$pageRenderer->addInlineSettingArray('TS', $GLOBALS['TSFE']->pSetup['inlineSettings.']);
946 949
		}
947 950
 
948 951
		if (is_array($GLOBALS['TSFE']->pSetup['extOnReady.'])) {
949
			$GLOBALS['TSFE']->addExtOnReadyCode($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['extOnReady.'], 'extOnReady.'));		
952
			$pageRenderer->addExtOnReadyCode($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['extOnReady.'], 'extOnReady.'));
950 953
		}
951 954
 
952 955
			// compression and concatenate settings
953 956
		if ($GLOBALS['TSFE']->config['config']['minifyCSS']) {
954
			$GLOBALS['TSFE']->enableCompressCss();
957
			$pageRenderer->enableCompressCss();
955 958
		}
956 959
		if ($GLOBALS['TSFE']->config['config']['minifyJS']) {
957
			$GLOBALS['TSFE']->enableCompressJavascript();
960
			$pageRenderer->enableCompressJavascript();
958 961
		}
959 962
		if ($GLOBALS['TSFE']->config['config']['concatenateJsAndCss']) {
960
			$GLOBALS['TSFE']->enableConcatenateFiles();
963
			$pageRenderer->enableConcatenateFiles();
961 964
		}
962 965

  
963 966
			// add header data block
964 967
		if ($GLOBALS['TSFE']->additionalHeaderData) {
965
			$GLOBALS['TSFE']->addHeaderData(implode(chr(10), $GLOBALS['TSFE']->additionalHeaderData));
968
			$pageRenderer->addHeaderData(implode(chr(10), $GLOBALS['TSFE']->additionalHeaderData));
966 969
		}
967 970

  
968 971
			// add footer data block
969 972
		if ($GLOBALS['TSFE']->additionalFooterData) {
970
			$GLOBALS['TSFE']->addFooterData(implode(chr(10), $GLOBALS['TSFE']->additionalFooterData));
973
			$pageRenderer->addFooterData(implode(chr(10), $GLOBALS['TSFE']->additionalFooterData));
971 974
		}
972 975

  
973 976
		// Header complete, now add content
......
1004 1007
		if (count($JSef[1])) { // Event functions:
1005 1008
			$bodyTag = preg_replace('/>$/', '', trim($bodyTag)) . ' ' . trim(implode(' ', $JSef[1])) . '>';
1006 1009
		}
1007
		$GLOBALS['TSFE']->addBodyContent(chr(10) . $bodyTag);
1010
		$pageRenderer->addBodyContent(chr(10) . $bodyTag);
1008 1011

  
1009 1012
			// Div-sections
1010 1013
		if ($GLOBALS['TSFE']->divSection) {
1011
			$GLOBALS['TSFE']->addBodyContent(chr(10) . $GLOBALS['TSFE']->divSection);
1014
			$pageRenderer->addBodyContent(chr(10) . $GLOBALS['TSFE']->divSection);
1012 1015
		}
1013 1016

  
1014 1017
			// Page content
1015
		$GLOBALS['TSFE']->addBodyContent(chr(10) . $pageContent);
1018
		$pageRenderer->addBodyContent(chr(10) . $pageContent);
1016 1019

  
1017 1020
			// Render complete page
1018
		$GLOBALS['TSFE']->content = $GLOBALS['TSFE']->render();
1021
		$GLOBALS['TSFE']->content = $pageRenderer->render();
1019 1022

  
1020 1023
			// Ending page
1021 1024
		if ($GLOBALS['TSFE']->pSetup['frameSet.']) {
typo3/sysext/cms/tslib/class.tslib_content.php (Arbeitskopie)
2818 2818
		$typeConf = $conf[$conf['type'] . '.'];
2819 2819

  
2820 2820
			//add SWFobject js-file
2821
		$GLOBALS['TSFE']->addJsFile('typo3/contrib/flashmedia/swfobject/swfobject.js');
2821
		$GLOBALS['TSFE']->getPageRenderer()->addJsFile('typo3/contrib/flashmedia/swfobject/swfobject.js');
2822 2822
		
2823 2823
		$player = $this->stdWrap($conf[$conf['type'] . '.']['player'], $conf[$conf['type'] . '.']['player.']);
2824 2824
		$installUrl = $conf['installUrl'] ? $conf['installUrl'] : $prefix . 'typo3/contrib/flashmedia/swfobject/expressInstall.swf';
......
2926 2926
		$typeConf = $conf[$conf['type'] . '.'];
2927 2927

  
2928 2928
			//add QTobject js-file
2929
		$GLOBALS['TSFE']->addJsFile('typo3/contrib/flashmedia/qtobject/qtobject.js');
2929
		$GLOBALS['TSFE']->getPageRenderer()->addJsFile('typo3/contrib/flashmedia/qtobject/qtobject.js');
2930 2930
		$replaceElementIdString = uniqid('mmqt');
2931 2931
		$GLOBALS['TSFE']->register['MMQTID'] = $replaceElementIdString;
2932 2932
		$qtObject = 'QTObject' . $replaceElementIdString;
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php (Arbeitskopie)
229 229
		$this->doc = t3lib_div::makeInstance('template');
230 230
		$this->doc->backPath = $GLOBALS['BACK_PATH'];
231 231
			// Loading the Prototype library and browse_links.js
232
		$this->doc->loadPrototype();
232
		$this->doc->getPageRenderer()->loadPrototype();
233 233
		$this->doc->loadJavascriptLib('js/browse_links.js');
234 234
			// Adding context menu code
235 235
		$this->doc->getContextMenuCode();
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php (Arbeitskopie)
180 180
		$this->doc->backPath = $BACK_PATH;
181 181

  
182 182
			// Load the Prototype library and browse_links.js
183
		$this->doc->loadPrototype();
183
		$this->doc->getPageRenderer()->loadPrototype();
184 184
		$this->doc->loadJavascriptLib('js/browse_links.js');
185 185

  
186 186
		$this->doc->getContextMenuCode();
typo3/sysext/recycler/mod1/index.php (Arbeitskopie)
137 137
			// Load CSS Stylesheets:
138 138
		$this->loadStylesheet($this->relativePath . 'res/css/customExtJs.css');
139 139
			// Load Ext JS:
140
		$this->doc->loadExtJS();
140
		$this->doc->getPageRenderer()->loadExtJS();
141 141
			// Integrate dynamic JavaScript such as configuration or lables:
142 142
		$this->doc->JScode.= t3lib_div::wrapJS('
143 143
			Ext.namespace("Recycler");
typo3/sysext/scheduler/mod1/index.php (Arbeitskopie)
602 602
		}
603 603

  
604 604
			// Load necessary JavaScript
605
		$this->doc->loadExtJS();
605
		/** @var $pageRenderer t3lib_PageRenderer */
606
		$pageRenderer = $this->doc->getPageRenderer();
607
		$pageRenderer->loadExtJS();
606 608
		$this->doc->loadJavascriptLib(t3lib_extMgm::extRelPath('scheduler') . 'res/tx_scheduler_be.js');
607
		$this->doc->addJsFile($this->backPath . '../t3lib/js/extjs/tceforms.js');
609
		$pageRenderer->addJsFile($this->backPath . '../t3lib/js/extjs/tceforms.js');
608 610

  
609 611
			// Define settings for Date Picker
610 612
		$typo3Settings = array(
......
612 614
			'dateFormat'       => array('j-n-Y', 'G:i j-n-Y'),
613 615
			'dateFormatUS'     => array('n-j-Y', 'G:i n-j-Y'),
614 616
		);
615
		$this->doc->addInlineSettingArray('', $typo3Settings);
617
		$pageRenderer->addInlineSettingArray('', $typo3Settings);
616 618

  
617 619
			// Define table layout for add/edit form
618 620
		$tableLayout = array (
......
834 836
			$registeredClasses = self::getRegisteredClasses();
835 837

  
836 838
				// Load ExtJS framework and specific JS library
837
			$this->doc->loadExtJS();
839
			$this->doc->getPageRenderer()->loadExtJS();
838 840
			$this->doc->loadJavascriptLib(t3lib_extMgm::extRelPath('scheduler') . 'res/tx_scheduler_be.js');
839 841

  
840 842
				// Initialise table layout
    (1-1/1)