TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use anchor links instead of javascript to go to detail view

Browse Source
This commit is contained in:
Eike Kettner 2020-10-18 14:09:52 +02:00
parent 791a61b24b
commit fc5035ea8d
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/webapp/src/main/elm/Comp/ItemCardList.elm
View File

@ -21,8 +21,8 @@ import Data.Items
import Data.UiSettings exposing (UiSettings) import Data.UiSettings exposing (UiSettings)
import Html exposing (..) import Html exposing (..)
import Html.Attributes exposing (..) import Html.Attributes exposing (..)
import Html.Events exposing (onClick)
import Markdown import Markdown
import Page exposing (Page(..))
import Util.ItemDragDrop as DD import Util.ItemDragDrop as DD
import Util.List import Util.List
import Util.String import Util.String
@ -37,7 +37,6 @@ type alias Model =
type Msg type Msg
= SetResults ItemLightList = SetResults ItemLightList
| AddResults ItemLightList | AddResults ItemLightList
| SelectItem ItemLight
| ItemDDMsg DD.Msg | ItemDDMsg DD.Msg
@ -63,19 +62,18 @@ prevItem model id =
--- Update --- Update
update : Flags -> Msg -> Model -> ( Model, Cmd Msg, Maybe ItemLight ) update : Flags -> Msg -> Model -> ( Model, Cmd Msg )
update flags msg model = update flags msg model =
let let
res = res =
updateDrag DD.init flags msg model updateDrag DD.init flags msg model
in in
( res.model, res.cmd, res.selected ) ( res.model, res.cmd )
type alias UpdateResult = type alias UpdateResult =
{ model : Model { model : Model
, cmd : Cmd Msg , cmd : Cmd Msg
, selected : Maybe ItemLight
, dragModel : DD.Model , dragModel : DD.Model
} }
@ -93,28 +91,25 @@ updateDrag dm _ msg model =
newModel = newModel =
{ model | results = list } { model | results = list }
in in
UpdateResult newModel Cmd.none Nothing dm UpdateResult newModel Cmd.none dm
AddResults list -> AddResults list ->
if list.groups == [] then if list.groups == [] then
UpdateResult model Cmd.none Nothing dm UpdateResult model Cmd.none dm
else else
let let
newModel = newModel =
{ model | results = Data.Items.concat model.results list } { model | results = Data.Items.concat model.results list }
in in
UpdateResult newModel Cmd.none Nothing dm UpdateResult newModel Cmd.none dm
SelectItem item ->
UpdateResult model Cmd.none (Just item) dm
ItemDDMsg lm -> ItemDDMsg lm ->
let let
ddd = ddd =
DD.update lm dm DD.update lm dm
in in
UpdateResult model Cmd.none Nothing ddd.model UpdateResult model Cmd.none ddd.model
@ -181,8 +176,7 @@ viewItem current settings item =
, ( "current", current == Just item.id ) , ( "current", current == Just item.id )
] ]
, id item.id , id item.id
, href "#" , Page.href (ItemDetailPage item.id)
, onClick (SelectItem item)
] ]
++ DD.draggable ItemDDMsg item.id ++ DD.draggable ItemDDMsg item.id
) )

10
modules/webapp/src/main/elm/Page/Home/Update.elm
View File

@ -82,21 +82,13 @@ update mId key flags settings msg model =
flags flags
m m
model.itemListModel model.itemListModel
( cmd, id ) =
case result.selected of
Just item ->
( Page.set key (ItemDetailPage item.id), Just item.id )
Nothing ->
( Cmd.none, Nothing )
in in
withSub withSub
( { model ( { model
| itemListModel = result.model | itemListModel = result.model
, dragDropData = DD.DragDropData result.dragModel Nothing , dragDropData = DD.DragDropData result.dragModel Nothing
} }
, Cmd.batch [ Cmd.map ItemCardListMsg result.cmd, cmd ] , Cmd.batch [ Cmd.map ItemCardListMsg result.cmd ]
) )
ItemSearchResp (Ok list) -> ItemSearchResp (Ok list) ->