[Pkg-mozext-commits] [firebug] 16/30: Issue 7524: 2 displays, fullscreen flash window goes behind the browser window

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firebug.

commit 4d99244c9ef512cb21252a6e3c9750396020d9a3
Author: Florent FAYOLLE <florent.fayolle69 at gmail.com>
Date:   Mon Jun 16 23:01:53 2014 +0200

    Issue 7524: 2 displays, fullscreen flash window goes behind the browser
    window
---
 extension/content/firebug/console/commandEditor.js | 13 +++++++++++++
 extension/content/firebug/console/commandLine.js   |  4 ++++
 extension/content/firebug/console/consolePanel.js  |  1 -
 extension/content/firebug/editor/sourceEditor.js   | 13 ++++++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/extension/content/firebug/console/commandEditor.js b/extension/content/firebug/console/commandEditor.js
index e6374f5..ad9ca4f 100644
--- a/extension/content/firebug/console/commandEditor.js
+++ b/extension/content/firebug/console/commandEditor.js
@@ -292,6 +292,19 @@ var CommandEditor = Obj.extend(Module,
             this.editor.blur(true);
     },
 
+    /**
+     * Save the cursor position so it can be restored when switching back to the
+     * Console panel.
+     *
+     * Should be used to save the selection without bluring (see issue 7524).
+     */
+    saveCursorLocation: function()
+    {
+        if (this.editor)
+            this.editor.saveCursorLocation();
+    },
+
+
     fontSizeAdjust: function(adjust)
     {
         if (!this.editor)
diff --git a/extension/content/firebug/console/commandLine.js b/extension/content/firebug/console/commandLine.js
index 66f1895..8c2e975 100644
--- a/extension/content/firebug/console/commandLine.js
+++ b/extension/content/firebug/console/commandLine.js
@@ -436,6 +436,10 @@ var CommandLine = Obj.extend(Module,
         // We are just closing the view.
         if (saveMultiLine)
         {
+            // Save the cursor position before switching to another panel,
+            // so switching back to the Console panel restores the cursor position (see issue 7273).
+            commandEditor.saveCursorLocation();
+
             commandLine.value = commandEditor.value;
 
             // Specify that the Command Editor is hidden, so we remove the padding
diff --git a/extension/content/firebug/console/consolePanel.js b/extension/content/firebug/console/consolePanel.js
index 71e1dd9..82874c1 100644
--- a/extension/content/firebug/console/consolePanel.js
+++ b/extension/content/firebug/console/consolePanel.js
@@ -1045,7 +1045,6 @@ ConsolePanel.prototype = Obj.extend(ActivablePanel,
             // Make sure that entire content of the Console panel is hidden when
             // the panel is disabled.
             CommandLine.setMultiLine(false, Firebug.chrome, commandEditor);
-            CommandLine.blur(this.context);
             Dom.collapse(Firebug.chrome.$("fbCommandBox"), true);
         }
     },
diff --git a/extension/content/firebug/editor/sourceEditor.js b/extension/content/firebug/editor/sourceEditor.js
index 7bb9f41..9e68cc1 100644
--- a/extension/content/firebug/editor/sourceEditor.js
+++ b/extension/content/firebug/editor/sourceEditor.js
@@ -909,10 +909,21 @@ SourceEditor.prototype =
     blur: function(saveCursorLocation)
     {
         if (saveCursorLocation)
-            this.savedCursorLocation = this.getSelection();
+            this.saveCursorLocation();
         this.win.blur();
     },
 
+    /**
+     * Save the cursor position so it can be restored when switching back to the
+     * Console panel.
+     *
+     * Should be used to save the selection without bluring (see issue 7524).
+     */
+    saveCursorLocation: function()
+    {
+        this.savedCursorLocation = this.getSelection();
+    },
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     // Breakpoints
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git