dwb: update ALL the things

diff --git a/dwb/default/bookmarks b/dwb/default/bookmarks
index 0e2520d86ce3e3389c0704d4550348334cc51b6a..4853171ae28a725d66885756487096d7c8df41df 100644 (file)
--- a/dwb/default/bookmarks
+++ b/dwb/default/bookmarks
@@ -18,3 +18,4 @@ https://www.dropbox.com/ Dropbox
 https://www.facebook.com/ Facebook
 https://www.humblebundle.com/ Humble Bundle
 https://www.loomio.org/ Loomio
 https://www.facebook.com/ Facebook
 https://www.humblebundle.com/ Humble Bundle
 https://www.loomio.org/ Loomio

+http://blog.techdev.de/code-snippet-edit-a-file-in-all-branches-using-git/ Code Snippet: Edit a File in all Branches using Git | techdev Solutions

diff --git a/dwb/default/cookies.allow b/dwb/default/cookies.allow
index 9e397e2d6a568092266e8b6221b8e0c6a23c0723..01f99927082c6618b4a31fec1761dfcd9d365f83 100644 (file)
--- a/dwb/default/cookies.allow
+++ b/dwb/default/cookies.allow
@@ -12,6 +12,7 @@
 .facebook.com
 .github.com
 .gitorious.org
 .facebook.com
 .github.com
 .gitorious.org

+.gmail.com

 .google.co.uk
 .google.com
 .google.nl
 .google.co.uk
 .google.com
 .google.nl


@@ -34,6 +35,8 @@
 .usenet-crawler.com
 .userscripts.org
 .www.dropbox.com
 .usenet-crawler.com
 .userscripts.org
 .www.dropbox.com

+.www.facebook.com
+.www.gmail.com

 .www.loomio.org
 .www.usenet-crawler.com
 .www.youtube.com
 .www.loomio.org
 .www.usenet-crawler.com
 .www.youtube.com


@@ -52,10 +55,13 @@ chakraos.org
 community.playstarbound.com
 duckduckgo.com
 eleum.unimaas.nl
 community.playstarbound.com
 duckduckgo.com
 eleum.unimaas.nl

+facebook.com

 forums.introversion.co.uk
 gist.github.com
 github.com
 gitorious.org
 forums.introversion.co.uk
 gist.github.com
 github.com
 gitorious.org

+gmail.com
+google.com

 jolla.com
 loomio.org
 mail.google.com
 jolla.com
 loomio.org
 mail.google.com


@@ -79,6 +85,8 @@ www.amazon.de
 www.bnpparibasfortis.be
 www.chakra-project.org
 www.dropbox.com
 www.bnpparibasfortis.be
 www.chakra-project.org
 www.dropbox.com

+www.facebook.com
+www.gmail.com

 www.humblebundle.com
 www.introversion.co.uk
 www.loomio.org
 www.humblebundle.com
 www.introversion.co.uk
 www.loomio.org

diff --git a/dwb/default/scripts.allow b/dwb/default/scripts.allow
index fc4fe15f04bb4da36421b6cf5822a5474e63bced..e74ac439a0e17e5dd22bc990392e429ac7b79081 100644 (file)
--- a/dwb/default/scripts.allow
+++ b/dwb/default/scripts.allow
@@ -7,11 +7,13 @@ docs.scipy.org
 duckduckgo.com
 eleum.unimaas.nl
 en.wikipedia.org
 duckduckgo.com
 eleum.unimaas.nl
 en.wikipedia.org

+encrypted.google.com

 github.com
 gitorious.org
 groups.google.com
 localhost
 mail.google.com
 github.com
 gitorious.org
 groups.google.com
 localhost
 mail.google.com

+maps.google.com

 np.reddit.com
 piratenpad.de
 plus.google.com
 np.reddit.com
 piratenpad.de
 plus.google.com


@@ -24,6 +26,7 @@ thetvdb.com
 together.jolla.com
 translate.google.com
 wiki.ros.org
 together.jolla.com
 translate.google.com
 wiki.ros.org

+www.amazon.co.uk

 www.amazon.com
 www.dropbox.com
 www.facebook.com
 www.amazon.com
 www.dropbox.com
 www.facebook.com


@@ -34,4 +37,3 @@ www.loomio.org
 www.reddit.com
 www.ros.org
 www.usenet-crawler.com
 www.reddit.com
 www.ros.org
 www.usenet-crawler.com

-www.youtube.com

diff --git a/dwb/forms b/dwb/forms
index 675110a9e2e93e4509773193c234f1237e4a76b9..3152415feef47a225ffe2f0ab606472c091f4398 100644 (file)
Binary files a/dwb/forms and b/dwb/forms differ

diff --git a/dwb/keys b/dwb/keys
index 69a4ec43a4f31847f1340e4b3d74c26ee7e1428c..9e796ea4d576ec945d727f8714ce09644f303d67 100644 (file)
--- a/dwb/keys
+++ b/dwb/keys
@@ -1,16 +1,16 @@
 [default]
 [default]

-save_search_field=gs
-tab_new=ga
-allow_session_cookie_tmp=CT
-allow_cookie=CC
-allow_session_cookie=CS
-bookmark=M
-buffers=gt
-cancel_download=ad
-sanitize=
-clear_tab=gc
-only=
-close_tab=d
+save_search_field= gs
+tab_new= ga
+allow_session_cookie_tmp= CT
+allow_cookie= CC
+allow_session_cookie= CS
+bookmark= M
+buffers= gt
+cancel_download= ad
+sanitize= 
+clear_tab= gc
+only= 
+close_tab= d

 entry_escape=Control c
 entry_confirm=Control g
 entry_history_back=Control k
 entry_escape=Control c
 entry_confirm=Control g
 entry_history_back=Control k


@@ -27,152 +27,152 @@ complete_history=Control H
 complete_path=Control p
 complete_searchengines=Control S
 complete_userscript=Control U
 complete_path=Control p
 complete_searchengines=Control S
 complete_userscript=Control U

-download=gd
+download= gd

 download_set_execute=Control x
 download_set_execute=Control x

-command_mode=:
-tabdo=
-execute_javascript=
-eval=
-execute_userscript=eu
-find_backward_ic=c?
-find_backward=?
-find_forward_ic=c/
-find_forward=/
-find_next=n
-find_previous=N
-focus_input=gi
-focus_next=K
-focus_tab=T
-focus_prev=J
-win_hist_back=wh
-tab_hist_back=th
-history_back=H
-win_hist_forward=wl
-tab_hist_forward=tl
-history_forward=L
-insert_mode=i
-show_keys=Sk
-load_html=
-load_html_tab=
-lock_domain=xd
-lock_uri=xu
-tab_move_left=gl
-tab_move_right=gr
-tab_move=gm
+command_mode= :
+tabdo= 
+execute_javascript= 
+eval= 
+execute_userscript= eu
+find_backward_ic= c?
+find_backward= ?
+find_forward_ic= c/
+find_forward= /
+find_next= n
+find_previous= N
+focus_input= gi
+focus_next= K
+focus_tab= T
+focus_prev= J
+win_hist_back= wh
+tab_hist_back= th
+history_back= H
+win_hist_forward= wl
+tab_hist_forward= tl
+history_forward= L
+insert_mode= i
+show_keys= Sk
+load_html= 
+load_html_tab= 
+lock_domain= xd
+lock_uri= xu
+tab_move_left= gl
+tab_move_right= gr
+tab_move= gm

 normal_mode=Control n
 open_editor=Control e
 normal_mode=Control n
 open_editor=Control e

-quickmark=b
-tab_quickmark=B
-win_quickmark=wb
+quickmark= b
+tab_quickmark= B
+win_quickmark= wb

 start_page=Control h
 start_page=Control h

-web_inspector=wi
-paste=pp
-tab_paste=Pp
-win_paste=wp
-paste_primary=pP
-win_paste_primary=wP
-tab_paste_primary=PP
+web_inspector= wi
+paste= pp
+tab_paste= Pp
+win_paste= wp
+paste_primary= pP
+win_paste_primary= wP
+tab_paste_primary= PP

 print=Control Mod1 p
 protect=Control P
 quit=Control q
 print=Control Mod1 p
 protect=Control P
 quit=Control q

-reload_bookmarks=
-reload=r
-reload_bypass_cache=R
-reload_quickmarks=
-reload_userscripts=
-save=sf
-save_session=ZZ
-save_named_session=gZZ
-save_quickmark=m
-scroll_down=j
-scroll_right=l
-scroll_left=h
+reload_bookmarks= 
+reload= r
+reload_bypass_cache= R
+reload_quickmarks= 
+reload_userscripts= 
+save= sf
+save_session= ZZ
+save_named_session= gZZ
+save_quickmark= m
+scroll_down= j
+scroll_right= l
+scroll_left= h

 scroll_page_down=Control f
 scroll_page_up=Control b
 scroll_halfpage_down=Control d
 scroll_halfpage_up=Control u
 scroll_page_down=Control f
 scroll_page_up=Control b
 scroll_halfpage_down=Control d
 scroll_halfpage_up=Control u

-scroll_bottom=G
-scroll_top=gg
-scroll_up=k
-local_set=
-set=
-set_key=sk
-set_local_setting=sl
-set_setting=ss
-show_settings=Ss
-print_preview=
-show_bookmarks=Sb
-show_downloads=Sd
-show_history=Sh
-show_quickmarks=Sq
+scroll_bottom= G
+scroll_top= gg
+scroll_up= k
+local_set= 
+set= 
+set_key= sk
+set_local_setting= sl
+set_setting= ss
+show_settings= Ss
+print_preview= 
+show_bookmarks= Sb
+show_downloads= Sd
+show_history= Sh
+show_quickmarks= Sq

 stop_loading=Control s
 stop_loading=Control s

-toggle_local_setting=
-toggle_setting=
+toggle_local_setting= 
+toggle_setting= 

 toggle_tab=Control @Tab@
 toggle_tab=Control @Tab@

-toggle_plugins_host_tmp=pth
-toggle_scripts_host=tsh
-toggle_scripts_host_tmp=tth
-toggle_scripts_uri=tsu
-toggle_plugins_uri_tmp=ptu
-toggle_scripts_uri_tmp=ttu
-fullscreen=@F11@
-toggle_hidden_files=g.
-toggle_plugins_host=ph
-toggle_plugins_uri=pu
-presentation_mode=@F12@
+toggle_plugins_host_tmp= pth
+toggle_scripts_host= tsh
+toggle_scripts_host_tmp= tth
+toggle_scripts_uri= tsu
+toggle_plugins_uri_tmp= ptu
+toggle_scripts_uri_tmp= ttu
+fullscreen= @F11@
+toggle_hidden_files= g.
+toggle_plugins_host= ph
+toggle_plugins_uri= pu
+presentation_mode= @F12@

 proxy=Control p
 proxy=Control p

-visible=xv
-toggle_bars=xx
-toggle_statusbar=xb
-toggle_tabbar=xt
-undo=u
-view_source=gf
-dump=
-yank_title=yt
-yank_title_primary=yT
-yank=yy
-yank_primary=yY
-zoom==
-zoom_in=+
-zoom_out=-
-hints_background=;b
-hints_images_background=.i
-hints_url_background=.o
-backopen_url=xO
-backopen=xo
-bookmarks=gb
-hints=f
-hints_clipboard=;y
-hints_download=;d
-hints_editable=;e
-hints_images=;i
-hints_links=;;
-hints_primary=;Y
-hints_rapid=;r
-hints_url=;o
-new_tab=V
-new_win=W
-open_url=go
-open=o
-hints_tab=F
-hints_images_tab=;I
-hints_url_tab=;O
-tab_bookmarks=gB
-tabopen_url=gO
-tabopen=O
-hints_win=wf
-hints_rapid_win=;R
-win_bookmarks=wB
-winopen_url=wO
-winopen=wo
-adblock_reload_rules=
-visual_mode=v
-tabgrep=
-repeat=.
+visible= xv
+toggle_bars= xx
+toggle_statusbar= xb
+toggle_tabbar= xt
+undo= u
+view_source= gf
+dump= 
+yank_title= yt
+yank_title_primary= yT
+yank= yy
+yank_primary= yY
+zoom= =
+zoom_in= +
+zoom_out= -
+hints_background= ;b
+hints_images_background= .i
+hints_url_background= .o
+backopen_url= xO
+backopen= xo
+bookmarks= gb
+hints= f
+hints_clipboard= ;y
+hints_download= ;d
+hints_editable= ;e
+hints_images= ;i
+hints_links= ;;
+hints_primary= ;Y
+hints_rapid= ;r
+hints_url= ;o
+new_tab= V
+new_win= W
+open_url= go
+open= o
+hints_tab= F
+hints_images_tab= ;I
+hints_url_tab= ;O
+tab_bookmarks= gB
+tabopen_url= gO
+tabopen= O
+hints_win= wf
+hints_rapid_win= ;R
+win_bookmarks= wB
+winopen_url= wO
+winopen= wo
+adblock_reload_rules= 
+visual_mode= v
+tabgrep= 
+repeat= .

 entry_delete_active=Control d
 entry_delete_active=Control d

-jump='
-mark=`
-hints_selector=
+jump= '
+mark= `
+hints_selector= 

 
 [mail]
 save_search_field=gs
 
 [mail]
 save_search_field=gs

diff --git a/dwb/userscripts/vimeo.js b/dwb/userscripts/vimeo.js
new file mode 100755 (executable)
index 0000000..36c017e
--- /dev/null
+++ b/dwb/userscripts/vimeo.js
@@ -0,0 +1,11 @@
+#!javascript
+
+var regex = new RegExp("(https?://vimeo.com/)(\\d*)");
+
+Signal.connect("navigation", function (wv, frame, request) {
+  if (wv.mainFrame == frame && regex.test(request.uri))  {
+    var uri = system.spawnSync("youtube-dl -g "+request.uri.replace(regex, "$1$2"));
+    system.spawn("mpv "+uri.stdout);
+  }
+  return false;
+});

diff --git a/dwb/userscripts/youtube.js b/dwb/userscripts/youtube.js
index 260ac7e8f7140752038d7cc8fc0f984ffe95aa15..b4cfccc1c923e15071b180f6a8a9793550ee8d29 100755 (executable)
--- a/dwb/userscripts/youtube.js
+++ b/dwb/userscripts/youtube.js
@@ -1,4 +1,4 @@
-#!javascript 
+#!javascript

 
 var regex = new RegExp("(https?://www.youtube.com/watch\\?)(?:.*&)*(v=.*)");
 
 
 var regex = new RegExp("(https?://www.youtube.com/watch\\?)(?:.*&)*(v=.*)");