Merge branch 'pu/2013.10-mailto' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 17:03:33 +0000 (18:03 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 17:03:33 +0000 (18:03 +0100)
tine20/Tinebase/js/tineInit.js

index f104bf6..62a10c2 100644 (file)
@@ -163,9 +163,8 @@ Tine.Tinebase.tineInit = {
     },
 
     initLoginPanel: function() {
-        var mainCardPanel = Tine.Tinebase.viewport.tineViewportMaincardpanel;
-
-        if (! Tine.loginPanel) {
+        if (window.isMainWindow && ! Tine.loginPanel) {
+            var mainCardPanel = Tine.Tinebase.viewport.tineViewportMaincardpanel;
             Tine.loginPanel = new Tine.Tinebase.LoginPanel({
                 defaultUsername: Tine.Tinebase.registry.get('defaultUsername'),
                 defaultPassword: Tine.Tinebase.registry.get('defaultPassword')