summaryrefslogtreecommitdiff
path: root/common/content/modes.js
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-10-06 08:56:13 -0400
committerKris Maglione <maglione.k@gmail.com>2011-10-06 08:56:13 -0400
commit40104c2b8bfd7068f3dec6e4a0a1f7291fab6db3 (patch)
treefa7303fd09b048dd928bed1d36d527ae554b4f95 /common/content/modes.js
parent0cf53f81813caf938caf4bc2796e08da7b564831 (diff)
downloadpentadactyl-40104c2b8bfd7068f3dec6e4a0a1f7291fab6db3.tar.gz
macros ≡ macros.
Diffstat (limited to 'common/content/modes.js')
-rw-r--r--common/content/modes.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/common/content/modes.js b/common/content/modes.js
index c923c6bf..e24911b6 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -178,17 +178,20 @@ var Modes = Module("modes", {
// when recording a macro
let macromode = "";
if (this.recording)
- macromode = " recording " + this.recording;
+ macromode = "recording " + this.recording + " ";
else if (this.replaying)
- macromode = " replaying";
+ macromode = "replaying";
if (!options.get("showmode").getKey(this.main.allBases, false))
return macromode;
- let val = this._modeMap[this._main].display();
- if (val)
- return "-- " + val + " --" + macromode;
- return macromode;
+ let modeName = this._modeMap[this._main].display();
+ if (!modeName)
+ return macromode;
+
+ if (macromode)
+ macromode = " " + macromode;
+ return "-- " + modeName + " --" + macromode;
},
NONE: 0,