Remove cleanUrl and fragment hack

NixOS · Oct 28, 2020 · a53d6ad · a53d6ad
1 parent e412085
commit a53d6ad
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/src/Main.elm b/src/Main.elm
@@ -160,29 +160,19 @@ changeRouteTo :
     -> ( Model, Cmd Msg )
 changeRouteTo model url =
     let
-        cleanUrl =
-            if url.fragment == Just "disabled" then
-                { url | fragment = Nothing }
-
-            else
-                url
-
-        newModel =
-            { model | url = cleanUrl }
-
         maybeRoute =
             Route.fromUrl url
     in
     case maybeRoute of
         Nothing ->
-            ( { newModel
+            ( { model
                 | page = NotFound
               }
             , Cmd.none
             )
 
         Just Route.NotFound ->
-            ( { newModel
+            ( { model
                 | page = NotFound
               }
             , Cmd.none
@@ -191,46 +181,46 @@ changeRouteTo model url =
         Just Route.Home ->
             -- Always redirect to /packages until we have something to show
             -- on the home page
-            ( newModel, Browser.Navigation.pushUrl newModel.navKey "/packages" )
+            ( model, Browser.Navigation.pushUrl model.navKey "/packages" )
 
         Just (Route.Packages channel query show from size sort) ->
             let
                 modelPage =
-                    case newModel.page of
+                    case model.page of
                         Packages x ->
                             Just x
 
                         _ ->
                             Nothing
             in
             Page.Packages.init channel query show from size sort modelPage
-                |> updateWith Packages PackagesMsg newModel
+                |> updateWith Packages PackagesMsg model
                 |> (\x ->
                         if url.fragment == Just "disabled" then
                             ( Tuple.first x, Cmd.none )
 
                         else
-                            submitQuery newModel x
+                            submitQuery model x
                    )
 
         Just (Route.Options channel query show from size sort) ->
             let
                 modelPage =
-                    case newModel.page of
+                    case model.page of
                         Options x ->
                             Just x
 
                         _ ->
                             Nothing
             in
             Page.Options.init channel query show from size sort modelPage
-                |> updateWith Options OptionsMsg newModel
+                |> updateWith Options OptionsMsg model
                 |> (\x ->
                         if url.fragment == Just "disabled" then
                             ( Tuple.first x, Cmd.none )
 
                         else
-                            submitQuery newModel x
+                            submitQuery model x
                    )
 
 

diff --git a/src/Search.elm b/src/Search.elm
@@ -282,7 +282,6 @@ update toRoute navKey msg model =
                 model.from
                 model.size
                 model.sort
-                |> (\x -> x ++ "#disabled")
                 |> Browser.Navigation.pushUrl navKey
             )
 
@@ -636,7 +635,7 @@ viewPager _ model result toRoute =
             ]
             [ a
                 [ if model.from == 0 then
-                    href "#disabled"
+                    href ""
 
                   else
                     href <|
@@ -659,7 +658,7 @@ viewPager _ model result toRoute =
             [ a
                 [ href <|
                     if model.from - model.size < 0 then
-                        "#disabled"
+                        ""
 
                     else
                         createUrl
@@ -681,7 +680,7 @@ viewPager _ model result toRoute =
             [ a
                 [ href <|
                     if model.from + model.size >= result.hits.total.value then
-                        "#disabled"
+                        ""
 
                     else
                         createUrl
@@ -703,7 +702,7 @@ viewPager _ model result toRoute =
             [ a
                 [ href <|
                     if model.from + model.size >= result.hits.total.value then
-                        "#disabled"
+                        ""
 
                     else
                         let