Href-based routing API now works beyond the first nest-level.

Author: David-OConnor

.gitignore

@@ -9,7 +9,6 @@ workspace.xml
 *.wasm
 # Allow JS in example folders
 # wasm-bindgen won't automatically create this directory.
-<<<<<<< HEAD
 # **/pkg/*
 **/.wasm
 **.d.ts
@@ -18,11 +17,4 @@ workspace.xml
 **/node_modules/
 **/target/
 **.log
-=======
-# pkg/
-*.d.ts
-*.ts
-*.js
-node_modules/
-*.log
->>>>>>> e449e6645f76720a29d6dfa7971198381acc247c
+

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.2.10
+- Routing can be triggered by clicking any element containing a `Href` attribute
+with value as a relative link
+- Internal links no longer trigger a page refresh
+- Models no longer need to implement `Clone`
+- Fixed a bug introduced in 0.2.9 for `select` elements
+
 ## v0.2.9
 - Added a `RenderThen` option to `Update`, which allows chaining update messages
 - Added a `.model` method to `Update`, allowing for cleaner recursion in updates

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "seed"
-version = "0.2.9"
+version = "0.2.10"
 description = "A Rust framework for creating web apps, using WebAssembly"
 authors = ["DavidOConnor <[email protected]>"]
 license = "MIT"

src/routing.rs

@@ -107,32 +107,10 @@ where
     app
 }
 
-<<<<<<< HEAD
+
 fn remove_first(s: &str) -> Option<&str> {
     s.chars().next().map(|c| &s[c.len_utf8()..])
 }
-=======
-pub fn setup_popstate_listener<Ms, Mdl>(app: &App<Ms, Mdl>, routes: fn(&Url) -> Ms)
-where
-    Ms: Clone,
-{
-    // We can't reuse the app later to store the popstate once moved into the closure.
-    let app_for_closure = app.clone();
-    let closure = Closure::wrap(Box::new(move |ev: web_sys::Event| {
-        let ev = ev
-            .dyn_ref::<web_sys::PopStateEvent>()
-            .expect("Problem casting as Popstate event");
-
-        let url: Url = match ev.state().as_string() {
-            Some(state_str) => serde_json::from_str(&state_str)
-                .expect("Problem deserialzing popstate state"),
-            // This might happen if we go back to a page before we started routing. (?)
-            None => {
-                let empty: Vec<String> = Vec::new();
-                Url::new(empty)
-            }
-        };
->>>>>>> e449e6645f76720a29d6dfa7971198381acc247c
 
 fn clean_url(mut url: Url) -> Url {
     let mut cleaned_path = vec![];
@@ -174,8 +152,6 @@ pub fn push_route(mut url: Url) {
     // the existing path. Not doing so will add the path to the existing one.
     let path = String::from("/") + &url.path.join("/");
 
-    crate::log(&path);
-
     util::window()
         .history()
         .expect("Can't find history")
@@ -253,10 +229,12 @@ pub fn setup_link_listener<Ms: Clone, Mdl>(app: &App<Ms, Mdl>, routes: fn(&Url)
                     }
                     if let Some(href) = el.get_attribute("href") {
                         if let Some(first) = href.chars().next() {
+                            // The first character being / indicates a rel link, which is what
+                            // we're intercepting.
                             if first == '/' {
                                 event.prevent_default();
-                                // Route internally based on href
-                                let url = Url::new(vec![href]);
+                                // Route internally based on href's value
+                                let url = Url::new(href.split('/').collect());
                                 app_for_closure.update(routes(&url));
                                 push_route(url);
                             }