From 1a3522f20da3f732ba0f86b1162711eec42b63b9 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 17 Dec 2014 17:38:14 -0800 Subject: [PATCH] Revert "ui.tools.browser: one browser to rule them all." This reverts commit 178c8c27e83dbbe010856ac5ef03af84c6115634. --- basis/ui/tools/browser/browser.factor | 12 ++++++------ basis/ui/tools/debugger/debugger.factor | 2 +- basis/ui/tools/error-list/error-list.factor | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 31f603798e..6c6bed5b70 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -98,6 +98,12 @@ M: browser-gadget focusable-child* search-field>> ; : browser-window ( -- ) "help.home" (browser-window) ; +: error-help-window ( error -- ) + { + [ error-help ] + [ dup tuple? [ class-of ] [ drop "errors" ] if ] + } 1|| (browser-window) ; + \ browser-window H{ { +nullary+ t } } define-command : com-browse ( link -- ) @@ -105,12 +111,6 @@ M: browser-gadget focusable-child* search-field>> ; [ [ raise-window ] [ gadget-child show-help ] bi ] [ (browser-window) ] if* ; -: help-error ( error -- ) - { - [ error-help ] - [ dup tuple? [ class-of ] [ drop "errors" ] if ] - } 1|| com-browse ; - : show-browser ( -- ) [ browser-gadget? ] find-window [ [ raise-window ] [ request-focus ] bi ] [ browser-window ] if* ; diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor index 847b8f7eb2..92f8229e94 100644 --- a/basis/ui/tools/debugger/debugger.factor +++ b/basis/ui/tools/debugger/debugger.factor @@ -81,7 +81,7 @@ debugger "gestures" f { : com-traceback ( debugger -- ) continuation>> traceback-window ; -: com-help ( debugger -- ) error>> help-error ; +: com-help ( debugger -- ) error>> error-help-window ; : com-edit ( debugger -- ) error>> edit-error ; diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor index 07367747fa..f9ca9ceeee 100644 --- a/basis/ui/tools/error-list/error-list.factor +++ b/basis/ui/tools/error-list/error-list.factor @@ -136,7 +136,7 @@ TUPLE: error-display < track ; control-value [ inspector ] when* ; : com-help ( error-display -- ) - control-value [ error>> help-error ] when* ; + control-value [ error>> error-help-window ] when* ; : com-edit ( error-display -- ) control-value [ edit-error ] when* ;