fixed bug #7211: "Start in Module" does not work anymore

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2927 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index b4aa678..fc23601 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-20  Ingo Renner  <ingo@typo3.org>
+
+       * fixed bug #7211: "Start in Module" does not work anymore
+
 2008-01-19  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * Added feature: Various enhancements to image dialog in htmlArea RTE

diff --git a/typo3/backend.php b/typo3/backend.php
index 8e938bb..2aa7df1 100644 (file)
--- a/typo3/backend.php
+++ b/typo3/backend.php
@@ -528,7 +528,7 @@ class TYPO3backend {
                ';
 
                        // Check editing of page:
-               $this->editPageHandling();
+               $this->handlePageEditing();
                $this->setStartupModule();
        }
 
@@ -538,7 +538,7 @@ class TYPO3backend {
         *
         * @return      void
         */
-       private function editPageHandling()     {
+       private function handlePageEditing()    {
 
                if(!t3lib_extMgm::isLoaded('cms'))      {
                        return;
@@ -608,16 +608,14 @@ class TYPO3backend {
                if($startModule) {
                        $this->js .= '
                        // start in module:
-               function startInModule(modName, cMR_flag, addGetVars)   {       //
-                       if ($(content) && top.goToModule) {
+               function startInModule(modName, cMR_flag, addGetVars)   {
+                       Event.observe(document, \'dom:loaded\', function() {
                                top.goToModule(modName, cMR_flag, addGetVars);
-                       } else {
-                               window.setTimeout(function() { startInModuleModule(modName, cMR_flag, addGetVars); }, 500);
-                       }
+                       });
                }
 
-//             startInModule(\''.$startModule.'\', false, \''.$moduleParameters.'\');
-                       '; //TODO get start module working
+               startInModule(\''.$startModule.'\', false, \''.$moduleParameters.'\');
+                       ';
                }
        }
 

diff --git a/typo3/classes/class.modulemenu.php b/typo3/classes/class.modulemenu.php
index 8aeb537..0fd8143 100644 (file)
--- a/typo3/classes/class.modulemenu.php
+++ b/typo3/classes/class.modulemenu.php
@@ -374,7 +374,7 @@ class ModuleMenu {
                                                }
 
                                                $javascriptCommand = '
-                                                       top.content.location=top.getModuleUrl(top.TS.PATH_typo3+"'.$this->appendQuestionmarkToLink($subModuleData['link']).'"'.$additionalJavascript.'+additionalGetVariables);
+                                                       $(\'content\').src = top.getModuleUrl(top.TS.PATH_typo3+"'.$this->appendQuestionmarkToLink($subModuleData['link']).'"'.$additionalJavascript.'+additionalGetVariables);
                                                        top.fsMod.currentMainLoaded="'.$parentModuleName.'";
                                                ';