From: Jan Schneider <jan@horde.org>
Date: Tue, 17 Aug 2010 08:48:36 +0000 (+0200)
Subject: Remove frameset left-overs.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=12aa7be6dfe90fb49154ca07b90a59fd27c33016;p=horde.git

Remove frameset left-overs.
---

diff --git a/ansel/js/slideshow.js b/ansel/js/slideshow.js
index be877bd4e..b09304e35 100644
--- a/ansel/js/slideshow.js
+++ b/ansel/js/slideshow.js
@@ -123,13 +123,8 @@ Slide.prototype = {
         // Add caption from gallery array.
         $(this.caption).update(SlideController.photos[SlideController.photoId][2]);
 
-        try {
-            document.title = document.title.replace(SlideController.photos[this.photoId][1],
-                                                    SlideController.photos[SlideController.photoId][1]);
-            if (parent.frames.horde_main) {
-                parent.document.title = document.title;
-            }
-        } catch (e) {}
+        document.title = document.title.replace(SlideController.photos[this.photoId][1],
+                                                SlideController.photos[SlideController.photoId][1]);
     },
     updateLinks: function() {
         var params = '?gallery=' + SlideController.galleryId + '&image=' + SlideController.photos[SlideController.photoId][3] + '&page=' + SlideController.photos[SlideController.photoId][4];
diff --git a/imp/js/dimpcore.js b/imp/js/dimpcore.js
index 065953798..3c4b0b0d9 100644
--- a/imp/js/dimpcore.js
+++ b/imp/js/dimpcore.js
@@ -305,13 +305,11 @@ var DimpCore = {
 
     redirect: function(url, force)
     {
-        var ptr = parent.frames.horde_main ? parent : window;
-
-        ptr.location.assign(this.addURLParam(url));
+        window.location.assign(this.addURLParam(url));
 
         // Catch browsers that don't redirect on assign().
         if (force && !Prototype.Browser.WebKit) {
-            (function() { ptr.location.reload(); }).delay(0.5);
+            (function() { window.location.reload(); }).delay(0.5);
         }
     },
 
diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 26e4014f9..de1312219 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -501,12 +501,6 @@ class IMP_Prefs_Ui
                     $_SESSION['imp']['maildomain'] = $maildomain;
                 }
             }
-
-            if ($prefs->isDirty('compose_popup')) {
-                Horde::addInlineScript(array(
-                    'if (window.parent.frames.horde_menu) window.parent.frames.horde_menu.location.reload();'
-                ));
-            }
             break;
 
         case 'delmove':
diff --git a/kastalia/templates/common-footer.inc b/kastalia/templates/common-footer.inc
index a47736c78..108cecf8c 100644
--- a/kastalia/templates/common-footer.inc
+++ b/kastalia/templates/common-footer.inc
@@ -1,17 +1,3 @@
-<script language="JavaScript1.5" type="text/javascript">
-<!--
-var _setHordeTitle = 1;
-try {
-    if (document.title && parent.frames.horde_main) parent.document.title = document.title;
-} catch (e) {
-}
-// -->
-</script>
-<script type="text/javascript">
-<!--
-if (typeof(_setHordeTitle) == 'undefined' && document.title && parent.frames.horde_main) parent.document.title = document.title;
-// -->
-</script>
 <?php if (isset($GLOBALS['notification'])) $GLOBALS['notification']->notify(array('listeners' => array('audio'))); ?>
 </body>
 </html>
diff --git a/kronolith/js/views.js b/kronolith/js/views.js
index 90521aae8..bc53d810c 100644
--- a/kronolith/js/views.js
+++ b/kronolith/js/views.js
@@ -79,13 +79,7 @@ function _ShowView()
 
     var titleDiv = $('view_title');
     if (titleDiv && titleDiv.firstChild && titleDiv.firstChild.nodeValue) {
-        var title = KronolithVar.page_title + titleDiv.firstChild.nodeValue;
-        try {
-            document.title = title;
-            if (parent.frames.horde_main) {
-                parent.document.title = title;
-            }
-        } catch (e) {}
+        document.title = KronolithVar.page_title + titleDiv.firstChild.nodeValue;
     }
 
     var viewVars = $('view_vars');