Mercurial > addons > firefox-addons > tab-mover
changeset 0:480f8e4f4500
Initial revision
| author | Guido Berhoerster <guido+tab-mover@berhoerster.name> |
|---|---|
| date | Sun, 19 Feb 2017 00:20:26 +0100 |
| parents | |
| children | 68114ae7d8b7 |
| files | COPYING Makefile NEWS README _locales/en/messages.json background.js icons/tab-mover.svg manifest.json |
| diffstat | 8 files changed, 1213 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/COPYING Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Makefile Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,63 @@ +# +# Copyright (C) 2017 Guido Berhoerster <guido+tab-mover@berhoerster.name> +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +NAME = tab-mover +VERSION = 1 +EXT_NAME = $(subst -,_,$(NAME))-$(VERSION) + +INKSCAPE := inkscape +INFOZIP := zip + +BITMAP_ICONS = icons/tab-mover-48.png \ + icons/tab-mover-96.png +DIST_FILES = manifest.json \ + background.js \ + COPYING \ + NEWS \ + README \ + $(wildcard _locales/*/messages.json) \ + $(BITMAP_ICONS) + +.DEFAULT_TARGET = all + +.PHONY: all extension clean clobber + +all: extension + +extension: $(EXT_NAME).zip + +$(EXT_NAME).zip: $(DIST_FILES) + $(INFOZIP) $@ $^ + +define generate-icon-rule +$1: $(1:%-$(lastword $(subst -, ,$1))=%.svg) + size=$(lastword $(subst -, ,$(basename $1))); \ + $(INKSCAPE) -w $$$${size} -h $$$${size} -e $$@ $$< +endef + +$(foreach icon,$(BITMAP_ICONS),$(eval $(call generate-icon-rule,$(icon)))) + +clean: + -rm -f $(BITMAP_ICONS) + +clobber: clean
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/NEWS Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,2 @@ +News +====
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,48 @@ +Tab Mover +========= + +Tab Mover is a Firefox Addon for quickly moving tabs between windows via the +page context menu. + +Usage +----- + +In order to move a tab between windows, open the tab context menu by clicking +on the tab using the right mouse button, then open the submenu named +"Tab Mover", and finally select a window from the submenu named "Move to +Window". + +In order to reopen a tab from a window in incognito mode in a normal window, +open the tab context menu by clicking the tab using the right mouse button, +then open the submenu named "Tab Mover", and finally select a window from the +submenu named "Reopen in Window". + +When using Firefox version 52 or earlier the "Tab Mover" submenu is in the +page context menu which can be opened by clicking anywhere on a page using the +right mouse button. + +Contact +------- + +Please send any feedback, translations or bug reports via email to +<guido+tab-mover@berhoerster.name> + +Bug Reports +----------- + +When sending bug reports, please always mention the exact version of the script +with which the issue occurs as well as the version of vim and the operating +system you are using and make sure that you provide sufficient information to +reproduce the issue and include any input, output, and any error messages. + +License +------- + +Except otherwise noted, all files are Copyright (C) 2017 Guido Berhoerster and +distributed under the following license terms: + +Copyright (C) 2017 Guido Berhoerster <guido+tab-mover@berhoerster.name> + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/_locales/en/messages.json Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,58 @@ +{ + "extensionName": { + "message": "Tab Mover", + "description": "Name of the extension." + }, + "extensionDescription": { + "message": "Move tabs between windows via context menu.", + "description": "Description of the extension." + }, + "moveToWindowMenu": { + "message": "Move to Window", + "description": "Label of the submenu for selecting a window to which the current tab should be moved to." + }, + "reopenInWindowMenu": { + "message": "Reopen in Window", + "description": "Label of the submenu for selecting a window in which the current tab should be reopened in." + }, + "defaultWindowTitle": { + "message": "Window $id$", + "description": "Default title for windows.", + "placeholders": { + "id": { + "content": "$1", + "example": "0" + } + } + }, + "defaultIncognitoWindowTitle": { + "message": "Window $id$ (Private Browsing)", + "description": "Default title for windows in incognito-mode.", + "placeholders": { + "id": { + "content": "$1", + "example": "0" + } + } + }, + "windowTitle": { + "message": "$title$", + "description": "Title for windows.", + "placeholders": { + "title": { + "content": "$1", + "example": "Download Firefox — Free Web Browser — Mozilla" + } + } + }, + "incognitoWindowTitle": { + "message": "$title$ (Private Browsing)", + "description": "Title for windows in incognito-mode.", + "placeholders": { + "title": { + "content": "$1", + "example": "Download Firefox — Free Web Browser — Mozilla" + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/background.js Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,398 @@ +/* + * Copyright (C) 2017 Guido Berhoerster <guido+tab-mover@berhoerster.name> + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +'use strict'; + +function createContextMenuItem(createProperties) { + return new Promise((resolve, reject) => { + browser.contextMenus.create(createProperties, () => { + if (browser.runtime.lastError) { + reject(browser.runtime.lastError); + } else { + resolve(); + } + }); + }); +} + +const Observable = (superclass) => class extends superclass { + constructor(...args) { + super(...args); + + this._observers = new Map(); + } + + addObserver(eventName, observer, thisArg) { + if (!this._observers.has(eventName)) { + this._observers.set(eventName, new Set()); + } + + this._observers.get(eventName).add(observer); + } + + deleteObserver(eventName, observer) { + if (this._observers.has(eventName)) { + this._observers.get(eventName).delete(observer); + } + } + + notifyObservers(eventName, ...args) { + if (!this._observers.has(eventName)) { + return; + } + + for (let observer of this._observers.get(eventName)) { + observer(eventName, ...args); + } + } +} + +class WindowsModel extends Observable(Object) { + constructor() { + super(); + + this.windows = new Map(); + this.focusedWindowId = browser.windows.WINDOW_ID_NONE; + } + + hasWindow(id) { + return this.windows.has(id); + } + + getWindow(id) { + return this.windows.get(id); + } + + getAllWindows() { + return this.windows.values(); + } + + getfocusedWindowId() { + return this.focusedWindowId; + } + + openWindow(id, incognito = false) { + this.windows.set(id, { + id, + title: browser.i18n.getMessage(incognito ? + 'defaultIncognitoWindowTitle' : 'defaultWindowTitle', id), + incognito + }); + + this.notifyObservers('window-opened', id); + } + + updateWindowTitle(id, title) { + if (!this.windows.has(id)) { + return; + } + + let windowInfo = this.windows.get(id) + windowInfo.title = browser.i18n.getMessage(windowInfo.incognito ? + 'incognitoWindowTitle' : 'windowTitle', title); + + this.notifyObservers('window-title-updated', id, title); + } + + focusWindow(id) { + let oldId = this.focusedWindowId; + this.focusedWindowId = this.windows.has(id) ? id : + browser.windows.WINDOW_ID_NONE; + + this.notifyObservers('window-focus-changed', oldId, id); + } + + closeWindow(id) { + if (!this.windows.has(id)) { + return; + } + + this.windows.delete(id); + + if (id === this.focusedWindowId) { + this.focusedWindowId = browser.windows.WINDOW_ID_NONE; + } + + this.notifyObservers('window-closed', id); + } +} + +class MenuView { + constructor(model) { + this.model = model; + this.moveMenuIds = new Set(); + this.reopenMenuIds = new Set(); + this.menuContexts = ['tab']; + + browser.runtime.getBrowserInfo().then(browserInfo => { + // Firefox before version 53 does not support tab context menus + let majorVersion = browserInfo.version.match(/^\d+/); + if (majorVersion !== null && majorVersion < 53) { + this.menuContexts = ['all']; + } + + return Promise.all([ + // create submenus + createContextMenuItem({ + id: 'move-menu', + title: browser.i18n.getMessage('moveToWindowMenu'), + enabled: false, + contexts: this.menuContexts + }), + createContextMenuItem({ + id: 'reopen-menu', + title: browser.i18n.getMessage('reopenInWindowMenu'), + enabled: false, + contexts: this.menuContexts + }) + ]); + }).then(values => { + this.model.addObserver('window-opened', + this.onWindowOpened.bind(this)); + this.model.addObserver('window-title-updated', + this.onWindowTitleUpdated.bind(this)); + this.model.addObserver('window-focus-changed', + this.onWindowFocusChanged.bind(this)); + this.model.addObserver('window-closed', + this.onWindowClosed.bind(this)); + }).catch(error => { + console.log('Error:', error); + }); + } + + enableMenus() { + return Promise.all([ + browser.contextMenus.update('move-menu', { + enabled: this.moveMenuIds.size > 0 + }), + browser.contextMenus.update('reopen-menu', { + enabled: this.reopenMenuIds.size > 0 + }) + ]); + } + + onWindowOpened(eventName, windowId) { + let focusedWindowId = this.model.getfocusedWindowId(); + if (focusedWindowId === browser.windows.WINDOW_ID_NONE) { + return; + } + + let menuId = String(windowId); + let windowInfo = this.model.getWindow(windowId); + let incognito = this.model.getWindow(focusedWindowId).incognito; + + if (incognito && !windowInfo.incognito) { + this.reopenMenuIds.add(menuId); + } else { + this.moveMenuIds.add(menuId); + } + + createContextMenuItem({ + id: menuId, + title: windowInfo.title, + contexts: this.menuContexts, + parentId: (incognito && !windowInfo.incognito) ? + 'reopen-menu' : 'move-menu' + }).then(() => { + return this.enableMenus(); + }).catch(error => { + console.log('Error:', error); + }); + } + + onWindowTitleUpdated(eventName, windowId, title) { + if (this.model.getfocusedWindowId() === + browser.windows.WINDOW_ID_NONE) { + return; + } + + browser.contextMenus.update(String(windowId), {title}).catch(error => { + console.log('Error:', error); + }); + } + + onWindowFocusChanged(eventName, oldWindowId, newWindowId) { + let promises = [ + // disable submenus + browser.contextMenus.update('move-menu', { + enabled: false + }), + browser.contextMenus.update('reopen-menu', { + enabled: false + }) + ]; + + if (newWindowId === browser.windows.WINDOW_ID_NONE) { + // just disable the submenus if focus moved to a window not tracked + Promise.all(promises).catch(error => { + console.log('Error:', error); + }); + return; + } + + Promise.all(promises).then(values => { + // remove all submenu items + let promises = new Array(...this.moveMenuIds, + ...this.reopenMenuIds).map(menuId => { + this.moveMenuIds.delete(menuId) || + this.reopenMenuIds.delete(menuId); + + return browser.contextMenus.remove(menuId); + }); + + return Promise.all(promises); + }).then(values => { + let incognito = this.model.getWindow(newWindowId).incognito; + + // rebuild submenus + let promises = []; + for (let windowInfo of this.model.getAllWindows()) { + if (windowInfo.id === newWindowId) { + // skip the currently focused window + continue; + } + + let menuId = String(windowInfo.id); + if (incognito && !windowInfo.incognito) { + this.reopenMenuIds.add(menuId); + } else { + this.moveMenuIds.add(menuId); + } + + // create menu item + promises.push(createContextMenuItem({ + id: menuId, + title: windowInfo.title, + contexts: this.menuContexts, + parentId: (incognito && !windowInfo.incognito) ? + 'reopen-menu' : 'move-menu' + })); + } + + return Promise.all(promises); + }).then(values => { + return this.enableMenus(); + }).catch(error => { + console.log('Error:', error); + }); + } + + onWindowClosed(eventName, windowId) { + if (this.model.getfocusedWindowId() === + browser.windows.WINDOW_ID_NONE) { + return; + } + + let menuId = String(windowId); + + this.moveMenuIds.delete(menuId) || this.reopenMenuIds.delete(menuId); + + browser.contextMenus.remove(menuId).then(() => { + return this.enableMenus(); + }).catch(error => { + console.log('Error:', error); + }); + } +} + +class Presenter { + constructor(model, view) { + this.model = model; + this.view = view; + + browser.windows.getAll({windowTypes: ['normal']}).then(windows => { + // populate model with existing windows + for (let windowInfo of windows) { + this.onWindowCreated(windowInfo); + + if (windowInfo.focused) { + this.onWindowFocusChanged(windowInfo.id); + } + } + + browser.windows.onCreated + .addListener(this.onWindowCreated.bind(this)); + browser.windows.onRemoved + .addListener(this.onWindowRemoved.bind(this)); + browser.windows.onFocusChanged + .addListener(this.onWindowFocusChanged.bind(this)); + browser.contextMenus.onClicked + .addListener(this.onMenuItemClicked.bind(this)); + }).catch(error => { + console.log('Error:', error); + }); + } + + onWindowCreated(windowInfo) { + // only track normal windows + if (windowInfo.type !== 'normal') { + return; + } + + this.model.openWindow(windowInfo.id, windowInfo.incognito); + + // get the window title and update the model + browser.tabs.query({ + active: true, + windowId: windowInfo.id + }).then(tabs => { + this.model.updateWindowTitle(tabs[0].windowId, tabs[0].title) + }).catch(error => { + console.log('Error:', error); + }); + } + + onWindowRemoved(windowId) { + this.model.closeWindow(windowId); + } + + onWindowFocusChanged(windowId) { + let prevFocusedWindowId = this.model.getfocusedWindowId(); + if (prevFocusedWindowId !== browser.windows.WINDOW_ID_NONE) { + // get title of the previously focused window and update the model + browser.tabs.query({ + active: true, + windowId: prevFocusedWindowId + }).then(tabs => { + this.model.updateWindowTitle(tabs[0].windowId, tabs[0].title) + }).catch(error => { + console.log('Error:', error); + }); + } + + this.model.focusWindow(windowId); + } + + onMenuItemClicked(info, tab) { + if (info.parentMenuItemId === 'move-menu') { + // move tab from the current window to the selected window + browser.tabs.move(tab.id, { + windowId: parseInt(info.menuItemId), + index: -1 + }).catch(error => { + console.log('Error:', error); + }); + } else { + // open the URL of the current tab in the selected window and close + // the current tab + browser.tabs.create({ + url: tab.url, + windowId: parseInt(info.menuItemId), + index: -1 + }).then(newTab => { + return browser.tabs.remove(tab.id); + }).catch(error => { + console.log('Error:', error); + }); + } + } +} + +let windowsModel = new WindowsModel(); +let menuView = new MenuView(windowsModel); +let presenter = new Presenter(windowsModel, menuView);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons/tab-mover.svg Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + viewBox="0 0 48 48.000001" + id="svg4199" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="tab-mover.svg"> + <title + id="title6440">Tab Mover</title> + <defs + id="defs4201"> + <linearGradient + inkscape:collect="always" + id="linearGradient5694"> + <stop + style="stop-color:#3465a4;stop-opacity:0" + offset="0" + id="stop5696" /> + <stop + id="stop5702" + offset="0.24956821" + style="stop-color:#3465a4;stop-opacity:1" /> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="1" + id="stop5698" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5684"> + <stop + style="stop-color:#eeeeec;stop-opacity:0" + offset="0" + id="stop5686" /> + <stop + id="stop5692" + offset="0.25649694" + style="stop-color:#eeeeec;stop-opacity:1" /> + <stop + style="stop-color:#eeeeec;stop-opacity:1" + offset="1" + id="stop5688" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5674"> + <stop + style="stop-color:#204a87;stop-opacity:0" + offset="0" + id="stop5676" /> + <stop + id="stop5682" + offset="0.24120744" + style="stop-color:#204a87;stop-opacity:1" /> + <stop + style="stop-color:#204a87;stop-opacity:1" + offset="1" + id="stop5678" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5694" + id="linearGradient5731" + gradientUnits="userSpaceOnUse" + x1="8" + y1="1059.3622" + x2="32.041523" + y2="1059.3622" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5684" + id="linearGradient5733" + gradientUnits="userSpaceOnUse" + x1="8" + y1="1059.3622" + x2="31.392092" + y2="1059.3622" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5674" + id="linearGradient5735" + gradientUnits="userSpaceOnUse" + x1="8" + y1="1059.3622" + x2="32.874856" + y2="1059.3622" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="22.032573" + inkscape:cy="21.805001" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + inkscape:window-width="1920" + inkscape:window-height="1021" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + showguides="false"> + <inkscape:grid + type="xygrid" + id="grid4747" /> + </sodipodi:namedview> + <metadata + id="metadata4204"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Tab Mover</dc:title> + <cc:license + rdf:resource="http://mozilla.org/MPL/2.0/" /> + <dc:creator> + <cc:Agent> + <dc:title>Guido Berhoerster</dc:title> + </cc:Agent> + </dc:creator> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1004.3622)"> + <g + id="g4828" + transform="translate(2,0)"> + <rect + ry="2" + rx="2" + y="1008.8622" + x="11.5" + height="32" + width="32" + id="rect4821" + style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" /> + <rect + y="1009.1122" + x="11.75" + height="7.25" + width="31.5" + id="rect4819" + style="opacity:1;fill:#204a87;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" + id="rect4808" + width="32" + height="32" + x="11.5" + y="1008.8622" + rx="2" + ry="2" /> + <path + d="m 13.5,1009.7988 c -0.604856,0 -1.0625,0.4577 -1.0625,1.0625 l 0,28 c 0,0.6049 0.457644,1.0625 1.0625,1.0625 l 28,0 c 0.604856,0 1.0625,-0.4576 1.0625,-1.0625 l 0,-28 c 0,-0.6048 -0.457644,-1.0625 -1.0625,-1.0625 l -28,0 z" + id="path5503" + style="opacity:1;fill:none;fill-opacity:1;stroke:#e7e7e5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" + inkscape:original="M 13.5 1008.8613 C 12.392 1008.8613 11.5 1009.7533 11.5 1010.8613 L 11.5 1038.8613 C 11.5 1039.9693 12.392 1040.8613 13.5 1040.8613 L 41.5 1040.8613 C 42.608 1040.8613 43.5 1039.9693 43.5 1038.8613 L 43.5 1010.8613 C 43.5 1009.7533 42.608 1008.8613 41.5 1008.8613 L 13.5 1008.8613 z " + inkscape:radius="-0.93747187" + sodipodi:type="inkscape:offset" /> + <rect + ry="2" + rx="2" + y="1008.8622" + x="11.5" + height="32" + width="32" + id="rect5497" + style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" /> + </g> + <g + id="g5737"> + <path + style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" + d="m 8.5,1023.8622 6,0 c 1,0 2,1 2,2 l 0,2 10,0 c 1.108,0 2,0.892 2,2 l 0,16 c 0,1.108 -0.892,2 -2,2 l -22,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-16 c 0,-0.9428 1,-2 2,-2 l 2,0 0,-2 c 0,-1.108 0.892,-2 2,-2 z" + id="path5469" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssscsssssssccss" /> + <path + transform="translate(0.5,-0.5)" + d="m 8,1025.3613 c -0.5713123,0 -1,0.4287 -1,1 l 0,2 a 1.0000719,1.0000719 0 0 1 -1,1 l -2,0 c -0.1476099,0 -0.4368983,0.1182 -0.6621094,0.3477 C 3.1126795,1029.9385 3,1030.2435 3,1030.3613 l 0,16 c 0,0.5713 0.4286877,1 1,1 l 22,0 c 0.571312,0 1,-0.4287 1,-1 l 0,-16 c 0,-0.5713 -0.428688,-1 -1,-1 l -10,0 a 1.0000719,1.0000719 0 0 1 -1,-1 l 0,-2 c 0,-0.1666 -0.114162,-0.4501 -0.332031,-0.6679 -0.21787,-0.2179 -0.501293,-0.3321 -0.667969,-0.3321 l -6,0 z" + id="path5507" + style="opacity:1;fill:none;fill-opacity:1;stroke:#e7e7e5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" + inkscape:original="M 8 1024.3613 C 6.892 1024.3613 6 1025.2533 6 1026.3613 L 6 1028.3613 L 4 1028.3613 C 3 1028.3613 2 1029.4185 2 1030.3613 L 2 1046.3613 C 2 1047.4693 2.892 1048.3613 4 1048.3613 L 26 1048.3613 C 27.108 1048.3613 28 1047.4693 28 1046.3613 L 28 1030.3613 C 28 1029.2533 27.108 1028.3613 26 1028.3613 L 16 1028.3613 L 16 1026.3613 C 16 1025.3613 15 1024.3613 14 1024.3613 L 8 1024.3613 z " + inkscape:radius="-0.99997187" + sodipodi:type="inkscape:offset" /> + <path + sodipodi:nodetypes="ssscsssssssccss" + inkscape:connector-curvature="0" + id="rect4806" + d="m 8.5,1023.8622 6,0 c 1,0 2,1 2,2 l 0,2 10,0 c 1.108,0 2,0.892 2,2 l 0,16 c 0,1.108 -0.892,2 -2,2 l -22,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-16 c 0,-0.9428 1,-2 2,-2 l 2,0 0,-2 c 0,-1.108 0.892,-2 2,-2 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.2;stroke-opacity:1" /> + </g> + <g + transform="translate(24.6875,14.25)" + id="g5536" /> + <g + id="g5723" + transform="matrix(0.76604444,-0.64278761,0.64278761,0.76604444,-668.92461,230.46198)" + style="opacity:0.9"> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path5725" + d="m 0.041523,1059.3622 24,2 0,4 8,-6 -8,-6 0,4 z" + style="fill:url(#linearGradient5731);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path5727" + d="m 3.042,1059.3622 22,1 0,3 5.5,-4 -5.5,-4 0,3 z" + style="opacity:0.25;fill:none;fill-rule:evenodd;stroke:url(#linearGradient5733);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient5735);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 0.041523,1059.3622 24,2 0,4 8,-6 -8,-6 0,4 z" + id="path5729" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + </g> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/manifest.json Sun Feb 19 00:20:26 2017 +0100 @@ -0,0 +1,28 @@ +{ + "manifest_version": 2, + "name": "__MSG_extensionName__", + "version": "1", + "description": "__MSG_extensionDescription__", + "author": "Guido Berhoerster", + "homepage_url": "https://code.guido-berhoerster.org/addons/firefox-addons/tab-mover/", + "applications": { + "gecko": { + "id": "tab-mover@code.guido-berhoerster.org", + "strict_min_version": "51.0" + } + }, + "icons": { + "48": "icons/tab-mover-48.png", + "96": "icons/tab-mover-96.png" + }, + "default_locale": "en", + "permissions": [ + "contextMenus", + "tabs" + ], + "background": { + "scripts": [ + "background.js" + ] + } +}