From d8e6cb32ad5ade025beded4e6925e786a064e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 27 Oct 2017 21:22:47 +0200
Subject: [PATCH] Make debug local

Add `Extension` and `debug` to all the module scopes for convenience.

(also add var to non-used function)
---
 extension.js    | 1 +
 liveAltTab.js   | 2 ++
 minimap.js      | 2 ++
 scratch.js      | 3 +++
 stackoverlay.js | 2 ++
 tiling.js       | 1 +
 utils.js        | 4 ++--
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/extension.js b/extension.js
index fd63d63..3fbd964 100644
--- a/extension.js
+++ b/extension.js
@@ -4,6 +4,7 @@ const Tiling = Extension.imports.tiling;
 const Scratch = Extension.imports.scratch;
 const LiveAltTab = Extension.imports.liveAltTab;
 const utils = Extension.imports.utils;
+const debug = utils.debug;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Meta = imports.gi.Meta;
diff --git a/liveAltTab.js b/liveAltTab.js
index 2e41860..99155e9 100644
--- a/liveAltTab.js
+++ b/liveAltTab.js
@@ -9,6 +9,8 @@ let WindowManager = imports.ui.windowManager;
 const Extension = imports.misc.extensionUtils.getCurrentExtension();
 const Scratch = Extension.imports.scratch;
 const Tiling = Extension.imports.tiling;
+const utils = Extension.imports.utils;
+const debug = utils.debug;
 
 WindowManager.WindowManager.prototype._previewWorkspace = function(from, to, direction) {
 
diff --git a/minimap.js b/minimap.js
index c4cfe37..06f3486 100644
--- a/minimap.js
+++ b/minimap.js
@@ -9,6 +9,8 @@ const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 
 const Tiling = Extension.imports.tiling;
+const utils = Extension.imports.utils;
+const debug = utils.debug;
 
 var MINIMAP_SCALE = 0.15;
 
diff --git a/scratch.js b/scratch.js
index c74294d..26389f5 100644
--- a/scratch.js
+++ b/scratch.js
@@ -1,4 +1,7 @@
+const Extension = imports.misc.extensionUtils.getCurrentExtension();
 const Meta = imports.gi.Meta;
+const utils = Extension.imports.utils;
+const debug = utils.debug;
 
 function isScratchWindow(metaWindow) {
     return metaWindow.is_on_all_workspaces();
diff --git a/stackoverlay.js b/stackoverlay.js
index fcf8de3..f67c768 100644
--- a/stackoverlay.js
+++ b/stackoverlay.js
@@ -5,6 +5,8 @@ const Tweener = imports.ui.tweener;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 const Shell = imports.gi.Shell;
+const utils = Extension.imports.utils;
+const debug = utils.debug;
 
 /*
   The stack overlay decorates the top stacked window with its icon and
diff --git a/tiling.js b/tiling.js
index 4ec1143..e09f24d 100644
--- a/tiling.js
+++ b/tiling.js
@@ -8,6 +8,7 @@ const Main = imports.ui.main;
 const Shell = imports.gi.Shell;
 const Gio = imports.gi.Gio;
 const utils = Extension.imports.utils;
+const debug = utils.debug;
 const Clutter = imports.gi.Clutter;
 
 var Minimap = Extension.imports.minimap;
diff --git a/utils.js b/utils.js
index 9f5af2c..69dc84f 100644
--- a/utils.js
+++ b/utils.js
@@ -1,7 +1,7 @@
 
 var debug_all = true; // Consider the default value in `debug_filter` to be true
 var debug_filter = { "#preview": false };
-debug = function() {
+var debug = function() {
     let keyword = arguments[0];
     let filter = debug_filter[keyword];
     if (filter === false)
@@ -82,7 +82,7 @@ var setDevGlobals = function() {
 /**
  * Visualize the frame and buffer bounding boxes of a meta window
  */
-toggleWindowBoxes = function(metaWindow) {
+var toggleWindowBoxes = function(metaWindow) {
     metaWindow = metaWindow || global.display.focus_window;
 
     if(metaWindow._paperDebugBoxes) {