From: Jan Schneider <jan@horde.org>
Date: Sat, 26 Jun 2010 14:06:04 +0000 (+0200)
Subject: Remove workarounds for the frameset.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c206d12d73f06d711efc878163a4fcae3dd7a086;p=horde.git

Remove workarounds for the frameset.
---

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 3c54fdf2e..a70461f61 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -248,13 +248,11 @@ KronolithCore = {
 
     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);
         }
     },
 
@@ -5784,17 +5782,13 @@ KronolithCore = {
 
 };
 
-if (parent.frames.horde_main) {
-    KronolithCore.redirect(window.location.href);
-} else {
-    /* Initialize global event handlers. */
-    document.observe('dom:loaded', KronolithCore.onDomLoad.bind(KronolithCore));
-    document.observe('DragDrop2:drag', KronolithCore.onDrag.bindAsEventListener(KronolithCore));
-    document.observe('DragDrop2:drop', KronolithCore.onDrop.bindAsEventListener(KronolithCore));
-    document.observe('DragDrop2:end', KronolithCore.onDragEnd.bindAsEventListener(KronolithCore));
-    document.observe('DragDrop2:start', KronolithCore.onDragStart.bindAsEventListener(KronolithCore));
-    document.observe('Horde_Calendar:select', KronolithCore.datePickerHandler.bindAsEventListener(KronolithCore));
-    if (Prototype.Browser.IE) {
-        $('kronolithBody').observe('selectstart', Event.stop);
-    }
+/* Initialize global event handlers. */
+document.observe('dom:loaded', KronolithCore.onDomLoad.bind(KronolithCore));
+document.observe('DragDrop2:drag', KronolithCore.onDrag.bindAsEventListener(KronolithCore));
+document.observe('DragDrop2:drop', KronolithCore.onDrop.bindAsEventListener(KronolithCore));
+document.observe('DragDrop2:end', KronolithCore.onDragEnd.bindAsEventListener(KronolithCore));
+document.observe('DragDrop2:start', KronolithCore.onDragStart.bindAsEventListener(KronolithCore));
+document.observe('Horde_Calendar:select', KronolithCore.datePickerHandler.bindAsEventListener(KronolithCore));
+if (Prototype.Browser.IE) {
+    $('kronolithBody').observe('selectstart', Event.stop);
 }