diff options
Diffstat (limited to 'conkeror')
-rw-r--r-- | conkeror/.conkerorrc/content-delay.js | 5 | ||||
-rw-r--r-- | conkeror/.conkerorrc/init.js | 82 |
2 files changed, 47 insertions, 40 deletions
diff --git a/conkeror/.conkerorrc/content-delay.js b/conkeror/.conkerorrc/content-delay.js index 7999090..eaf89db 100644 --- a/conkeror/.conkerorrc/content-delay.js +++ b/conkeror/.conkerorrc/content-delay.js @@ -1,3 +1,6 @@ +/*global require content_buffer session_token load_spec + * load_spec_uri_string add_hook */ + /* This script is a hack that provides delayed loading for content buffers. @@ -7,6 +10,7 @@ returns the delayed url, not about:blank, so things like tabs and sessions will still work properly. */ +require('session'); function content_delay (spec) { this.delayed_load = spec; @@ -45,5 +49,4 @@ function content_delay_do_initial_load (b) { } add_hook("create_buffer_early_hook", content_delay_init); - add_hook("select_buffer_hook", content_delay_do_initial_load); diff --git a/conkeror/.conkerorrc/init.js b/conkeror/.conkerorrc/init.js index 5996849..7d76082 100644 --- a/conkeror/.conkerorrc/init.js +++ b/conkeror/.conkerorrc/init.js @@ -1,40 +1,40 @@ require("content-policy.js"); require("favicon"); require("session"); -require("github"); -require("reddit"); - -let (home = get_home_directory()) { - let (projects = home.clone(), - init = home.clone(), - downloads = home.clone()) { - - projects.append('projects'); - init.append('.conkerorrc'); - downloads.append('downloads'); - - let (cdispass = projects.clone(), - site_js = init.clone(), - page_modes = init.clone(), - themes = init.clone(), - search_engines = init.clone()) { - - cdispass.append('cdispass'); - site_js.append('site-js'); - page_modes.append('page-modes'); - themes.append('themes'); - search_engines.append('search-engines'); - - load_paths.push("file://" + cdispass.path); - load_paths.push("file://" + site_js.path); - load_paths.push("file://" + page_modes.path); - theme_load_paths.push(themes.path); - opensearch_load_paths.push(search_engines); - }; - - cwd = downloads; - }; -}; +// require("github"); +// require("reddit"); + +function setup_load_paths() { + let home = get_home_directory(), + projects = home.clone(), + init = home.clone(), + downloads = home.clone(); + + projects.append('projects'); + init.append('.conkerorrc'); + downloads.append('downloads'); + + let cdispass = projects.clone(), + site_js = init.clone(), + page_modes = init.clone(), + themes = init.clone(), + search_engines = init.clone(); + + cdispass.append('cdispass'); + site_js.append('site-js'); + page_modes.append('page-modes'); + themes.append('themes'); + search_engines.append('search-engines'); + + load_paths.push("file://" + cdispass.path); + load_paths.push("file://" + site_js.path); + load_paths.push("file://" + page_modes.path); + theme_load_paths.push(themes.path); + opensearch_load_paths.push(search_engines); + + cwd = downloads; +} +setup_load_paths(); require("cdispass"); require("jira"); @@ -258,10 +258,10 @@ add_hook("before_quit_hook", oni_before_quit_func); add_hook("content_policy_hook", content_policy_bytype); add_hook("mode_line_hook", mode_line_adder(buffer_count_widget)); add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget), true); -add_hook("mode_line_hook", mode_line_adder(downloads_status_widget)); +// add_hook("mode_line_hook", mode_line_adder(downloads_status_widget)); add_hook('mode_line_hook', mode_line_adder(scuttle_bookmarked_widget)); -remove_hook("download_added_hook", open_download_buffer_automatically); +// remove_hook("download_added_hook", open_download_buffer_automatically); hints_minibuffer_annotation_mode(true); theme_load("yoshi"); @@ -341,10 +341,14 @@ read_url_handler_list = [read_url_github_command_handler, read_url_duckduckbang_handler]; // Mozrepl -let (mozrepl_init = get_home_directory()) { +function setup_mozrepl() { + let mozrepl_init = get_home_directory(); + mozrepl_init.appendRelativePath(".mozrepl-conkeror.js"); - session_pref('extensions.mozrepl.initUrl', make_uri(mozrepl_init).spec); -}; + session_pref('extensions.mozrepl.initUrl', + make_uri(mozrepl_init).spec); +} +setup_mozrepl(); if ('@hyperstruct.net/mozlab/mozrepl;1' in Cc) { let mozrepl = Cc['@hyperstruct.net/mozlab/mozrepl;1'] |