From 1eeaf137bd30aff1bef34d05eeec686f6da8959d Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Sun, 23 May 2021 22:09:50 +0200 Subject: Update editor --- editor/editor.ml | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'editor/editor.ml') diff --git a/editor/editor.ml b/editor/editor.ml index 2849b29..bca8fb2 100755 --- a/editor/editor.ml +++ b/editor/editor.ml @@ -56,14 +56,6 @@ let build_view view, last_backup -(** [update] is the event loop. - - The function take a new event, and apply it to the current state. *) - -let update - : 'a option Note.E.send -> (App.events, State.t) Application.t - = App.update - let app id content = (* This event is used in the pop process. The sender is given to the @@ -71,7 +63,7 @@ let app id content = let (event: Forms.Events.event option Note.event), sender = Note.E.create () in (* Check the pre-requisite *) - let events_opt = Actions.populate_menu () in + let events_opt = Actions.populate_menu sender in match (Jv.is_none id), (Jv.is_none content), events_opt with | false, false, Some btn_events -> @@ -81,25 +73,16 @@ let app id content = let page_id = State.Storage.page_id () in let view, last_backup = build_view pm page_id editor in - let init_state = - State.{ editable = true - ; view - ; last_backup - ; page_id - - ; window = [] - ; pm - } - in + let init_state = State.init pm view last_backup page_id in let app_state = Application.run ~eq:State.eq - (App.update sender) + (App.update ) init_state (Note.E.select [ Brr_note.Evr.on_el Ev.focusout (fun _ -> App.StoreEvent) editor - ; Note.E.map (fun () -> App.DeleteEvent) btn_events.Actions.delete - ; Note.E.map (fun () -> App.AddEvent) btn_events.Actions.add + ; Note.E.map (fun ev -> App.Generic ev) btn_events.Actions.delete + ; Note.E.map (fun ev -> App.Generic ev) btn_events.Actions.add ; Note.E.map (fun v -> App.LoadEvent v) btn_events.Actions.redirect ; Note.E.map (fun v -> App.ClosePopup v) event ]) in -- cgit v1.2.3