1. From f3ad98ac87f9f1c789b9e3f2fe1875cde089d680 Mon Sep 17 00:00:00 2001
  2. From: poma <[email protected]>
  3. Date: Tue, 31 Mar 2015 03:13:15 +0300
  4. Subject: [PATCH] b
  6. ---
  7. js/ui/sidebar.js | 2 +-
  8. manifest.json | 7 ++++++-
  9. 2 files changed, 7 insertions(+), 2 deletions(-)
  11. diff --git a/js/ui/sidebar.js b/js/ui/sidebar.js
  12. index 9263e6e..1d0d9fb 100644
  13. --- a/js/ui/sidebar.js
  14. +++ b/js/ui/sidebar.js
  15. @@ -1,7 +1,7 @@
  16. /* Copyright (c) 2012 Joel Thornton <[email protected]> See LICENSE.txt for license details. */
  18. var manager,bg,settings;$(document).ready(onReady);
  19. -function onReady(){bg=chrome.extension.getBackgroundPage();settings=bg.settings;$.fx.off=!settings.get("animationEnabled");manager=new SidebarNavManager($("ul#sidebarButtons"),$("tr#sidebars"),$("table#main"),$("body"),"td");manager.addSidebarPanes(bg.paneCatalog.items);var a=settings.get("lastSidebarPaneId");if(void 0===a||-1==bg.paneCatalog.getPaneIds().indexOf(a))a=bg.paneCatalog.items[0].id;manager.showSidebarPane(a);$(window).load(function(){setTimeout(function(){manager.scrollToCurrentSidebarPane(!0)},0);
  20. +function onReady(){bg=chrome.extension.getBackgroundPage();while (bg == undefined || bg.settings == undefined || bg.paneCatalog == undefined) {setTimeout(onReady, 1);return;};settings=bg.settings;$.fx.off=!settings.get("animationEnabled");manager=new SidebarNavManager($("ul#sidebarButtons"),$("tr#sidebars"),$("table#main"),$("body"),"td");manager.addSidebarPanes(bg.paneCatalog.items);var a=settings.get("lastSidebarPaneId");if(void 0===a||-1==bg.paneCatalog.getPaneIds().indexOf(a))a=bg.paneCatalog.items[0].id;manager.showSidebarPane(a);$(window).load(function(){setTimeout(function(){manager.scrollToCurrentSidebarPane(!0)},0);
  21. setTimeout(function(){manager.scrollToCurrentSidebarPane(!0)},100)});$(document).keydown(onDocumentKeyDown).scroll(onDocumentScroll).mouseover(onDocumentMouseOver);$(window).resize(onWindowResize);$("#optionsButton").attr("title",getMessage("sidebars_optionsButtonTooltip")).tooltip({position:"bottom center",predelay:400,offset:[15,-15]}).click(onClickOptionsButton).mousedown(onMouseDownOptionsButton).mouseup(onMouseUpOptionsButton).mouseover(onMouseOverOptionsButton).mouseout(onMouseUpOptionsButton);
  22. setI18NText();bg.sidebarHandler.registerSidebarPane("sidebarHost",window)}function onDocumentKeyDown(a){if(27==a.keyCode||a.ctrlKey&&70==a.keyCode||!a.ctrlKey&&!a.altKey&&48<=a.keyCode&&90>=a.keyCode||a.ctrlKey&&86==a.keyCode||a.ctrlKey&&115==a.keyCode)try{var b=$("#sidebarContainer__"+manager.currentSidebarId).children("iframe").get(0).contentWindow;b.jQuery(b.document).trigger(a);return!1}catch(c){}return!0}function onDocumentScroll(){manager.scrolling||manager.scrollToCurrentSidebarPane(!0)}
  23. function onDocumentMouseOver(){settings.get("focusSidebarOnHover")&&bg.sidebarHandler.focus()}function onWindowResize(){bg.sidebarHandler.onResize();manager.scrollToCurrentSidebarPane(!0)}function onClickOptionsButton(){var a=chrome.extension.getURL("/options.html");chrome.tabs.query({url:a},function(b){0==b.length?chrome.tabs.create({url:a}):chrome.tabs.update(b[0].id,{active:!0})})}
  24. diff --git a/manifest.json b/manifest.json
  25. index 7894436..6b51b15 100644
  26. --- a/manifest.json
  27. +++ b/manifest.json
  28. @@ -14,11 +14,16 @@
  29. },
  30. "background": {
  31. "page": "background.html"
  32. - },
  33. + },
  34. "browser_action": {
  35. "default_icon": "images/sidewise_icon_16.png",
  36. "default_title": "Open Sidewise"
  37. },
  38. + "sidebar_action": {
  39. + "default_icon": "images/sidewise_icon_16.png",
  40. + "default_title" : "Open Sidewise",
  41. + "default_panel": "sidebar.html"
  42. + },
  43. "content_scripts": [
  44. {
  45. "matches": ["http://*/*", "https://*/*"],
  46. --
  47. 1.8.1.2