From efa8ee4e63d8c07130c6b02d93ab3cc46209e948 Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Tue, 1 Dec 2009 17:43:26 +0800
Subject: Added example in the config to reset the keycmd on page navigation.

---
 examples/config/uzbl/config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'examples/config')

diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index 9fda268..fa82fda 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -43,9 +43,11 @@ set new_window         = sh 'uzbl-browser -u $8' # equivalent to the default beh
 # Load start handlers
 @on_event   LOAD_START     @set_status <span foreground="khaki">wait</span>
 
-# Load commit handler
+# Load commit handlers
 @on_event   LOAD_COMMIT    @set_status <span foreground="green">recv</span>
 @on_event   LOAD_COMMIT    script @scripts_dir/scroll-percentage.js
+# Reset the keycmd on navigation
+@on_event   LOAD_COMMIT    @set_mode
 
 # Load finish handlers
 @on_event   LOAD_FINISH    @set_status <span foreground="gold">done</span>
@@ -63,7 +65,6 @@ set new_window         = sh 'uzbl-browser -u $8' # equivalent to the default beh
 # Misc on_event handlers
 #@on_event  CONFIG_CHANGED print Config changed: %1 = %2
 
-
 # === Behaviour and appearance ===============================================
 
 set show_status       = 1
-- 
cgit v1.2.3


From dbdd7053b19275fff29787f50855eca82921bccf Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Tue, 1 Dec 2009 17:46:14 +0800
Subject: TOGGLE_MODES is not a configuration event so use the event function.

---
 examples/config/uzbl/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/config')

diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index fa82fda..a9ae29a 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -10,7 +10,7 @@ set bind           = request BIND
 # request MODE_CONFIG <mode> <key> = <value
 set mode_config    = request MODE_CONFIG
 # request TOGGLE_MODES <mode1> <mode2> ... <moden>
-set toggle_modes   = request TOGGLE_MODES
+set toggle_modes   = event TOGGLE_MODES
 # request ON_EVENT <EVENT_NAME> <command>
 set on_event       = request ON_EVENT
 # request PROGRESS_CONFIG <key> = <value>
@@ -313,7 +313,7 @@ set default_mode = command
 # Changing mode method via set.
 @bind I = @set_mode insert
 
-# Or toggle between modes by rasing request events.
+# Or toggle between modes by rasing the toggle event.
 set toggle_cmd_ins = @toggle_modes command insert
 
 @bind i        = @toggle_cmd_ins
-- 
cgit v1.2.3


From 4ba53742159e166fd25cc5c83a953bc1e39c81d9 Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Sat, 5 Dec 2009 17:12:59 +0800
Subject: Added @jsh JavaScript helper variable.

---
 examples/config/uzbl/config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'examples/config')

diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index a9ae29a..54de972 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -29,6 +29,8 @@ set shell_cmd      = sh -c
 # Spawn path shortcuts. In spawn the first dir+path match is used in "dir1:dir2:dir3:executable"
 set scripts_dir    = $XDG_DATA_HOME/uzbl:@prefix/share/uzbl/examples/data/uzbl:scripts
 
+# Javascipt helpers.
+set jsh = js var run=Uzbl.run; function get(k){return run("print \\\@"+k)}; function set(k, v) {run("set "+k+" = "+v)};
 
 # === Handlers ===============================================================
 
@@ -141,7 +143,6 @@ set open_new_window = sh 'uzbl-browser -u \@SELECTED_URI'
 @bind    <Button2>  = js if("\@SELECTED_URI") { Uzbl.run("\@open_new_window"); } else { Uzbl.run("\\\@load_from_xclip"); }
 
 # Edit HTML forms in external editor
-#
 set external_editor = gvim
 #set external_editor = xterm -e vim
 @bind    E         = script @scripts_dir/extedit.js
-- 
cgit v1.2.3


From 5c514a0d42324efbb60c657d171e93720ba422b1 Mon Sep 17 00:00:00 2001
From: Mason Larobina <mason.larobina@gmail.com>
Date: Sat, 5 Dec 2009 18:19:55 +0800
Subject: Updated <Button2> binding to use the new @jsh helper.

---
 examples/config/uzbl/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/config')

diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index 54de972..69a211c 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -140,7 +140,7 @@ set socket_dir        = /tmp
 # otherwise open the selection in the current window
 set load_from_xclip = sh 'echo "uri $(xclip -o)" > $4'
 set open_new_window = sh 'uzbl-browser -u \@SELECTED_URI'
-@bind    <Button2>  = js if("\@SELECTED_URI") { Uzbl.run("\@open_new_window"); } else { Uzbl.run("\\\@load_from_xclip"); }
+@bind    <Button2>  = @jsh if(get("SELECTED_URI")) { run("\@open_new_window"); } else { run("\\\@load_from_xclip"); }
 
 # Edit HTML forms in external editor
 set external_editor = gvim
-- 
cgit v1.2.3