actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update handlebars from 0.11.x to 0.12.x

This commit is contained in:
Mathieu David 2015-12-15 18:58:34 +01:00
parent d376b0663a
commit 4ca6693a48
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -15,7 +15,7 @@ exclude = [
[dependencies] [dependencies]
clap = "~1.5.3" clap = "~1.5.3"
handlebars = "=0.11.2" handlebars = "~0.12.0"
rustc-serialize = "~0.3.16" rustc-serialize = "~0.3.16"
pulldown-cmark = "~0.0.3" pulldown-cmark = "~0.0.3"

20
src/renderer/html_handlebars/helpers/navigation.rs
View File

@ -27,7 +27,7 @@ pub fn previous(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext
// Decode json format // Decode json format
let decoded: Vec<BTreeMap<String, String>> = match json::decode(&chapters.to_string()) { let decoded: Vec<BTreeMap<String, String>> = match json::decode(&chapters.to_string()) {
Ok(data) => data, Ok(data) => data,
Err(_) => return Err(RenderError{ desc: "Could not decode the JSON data"}), Err(_) => return Err(RenderError{ desc: "Could not decode the JSON data".to_owned()}),
}; };
let mut previous: Option<BTreeMap<String, String>> = None; let mut previous: Option<BTreeMap<String, String>> = None;
@ -55,7 +55,7 @@ pub fn previous(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext
}, },
None => { None => {
debug!("[*]: No title found for chapter"); debug!("[*]: No title found for chapter");
return Err(RenderError{ desc: "No title found for chapter in JSON data" }) return Err(RenderError{ desc: "No title found for chapter in JSON data".to_owned() })
} }
}; };
@ -68,10 +68,10 @@ pub fn previous(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext
match path.to_str() { match path.to_str() {
Some(p) => { previous_chapter.insert("link".to_owned(), p.to_json()); }, Some(p) => { previous_chapter.insert("link".to_owned(), p.to_json()); },
None => return Err(RenderError{ desc: "Link could not be converted to str" }) None => return Err(RenderError{ desc: "Link could not be converted to str".to_owned() })
} }
}, },
None => return Err(RenderError{ desc: "No path found for chapter in JSON data" }) None => return Err(RenderError{ desc: "No path found for chapter in JSON data".to_owned() })
} }
debug!("[*]: Inject in context"); debug!("[*]: Inject in context");
@ -84,7 +84,7 @@ pub fn previous(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext
Some(t) => { Some(t) => {
try!(t.render(&updated_context, r, rc)); try!(t.render(&updated_context, r, rc));
}, },
None => return Err(RenderError{ desc: "Error with the handlebars template" }) None => return Err(RenderError{ desc: "Error with the handlebars template".to_owned() })
} }
} }
@ -124,7 +124,7 @@ pub fn next(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext) ->
// Decode json format // Decode json format
let decoded: Vec<BTreeMap<String, String>> = match json::decode(&chapters.to_string()) { let decoded: Vec<BTreeMap<String, String>> = match json::decode(&chapters.to_string()) {
Ok(data) => data, Ok(data) => data,
Err(_) => return Err(RenderError{ desc: "Could not decode the JSON data"}), Err(_) => return Err(RenderError{ desc: "Could not decode the JSON data".to_owned() }),
}; };
let mut previous: Option<BTreeMap<String, String>> = None; let mut previous: Option<BTreeMap<String, String>> = None;
@ -140,7 +140,7 @@ pub fn next(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext) ->
let previous_path = match previous.get("path") { let previous_path = match previous.get("path") {
Some(p) => p, Some(p) => p,
None => return Err(RenderError{ desc: "No path found for chapter in JSON data"}) None => return Err(RenderError{ desc: "No path found for chapter in JSON data".to_owned() })
}; };
if previous_path == &current { if previous_path == &current {
@ -155,7 +155,7 @@ pub fn next(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext) ->
debug!("[*]: Inserting title: {}", n); debug!("[*]: Inserting title: {}", n);
next_chapter.insert("title".to_owned(), n.to_json()); next_chapter.insert("title".to_owned(), n.to_json());
} }
None => return Err(RenderError{ desc: "No title found for chapter in JSON data"}) None => return Err(RenderError{ desc: "No title found for chapter in JSON data".to_owned() })
} }
@ -164,7 +164,7 @@ pub fn next(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext) ->
match link.to_str() { match link.to_str() {
Some(l) => { next_chapter.insert("link".to_owned(), l.to_json()); }, Some(l) => { next_chapter.insert("link".to_owned(), l.to_json()); },
None => return Err(RenderError{ desc: "Link could not converted to str"}) None => return Err(RenderError{ desc: "Link could not converted to str".to_owned() })
} }
debug!("[*]: Inject in context"); debug!("[*]: Inject in context");
@ -178,7 +178,7 @@ pub fn next(c: &Context, _h: &Helper, r: &Handlebars, rc: &mut RenderContext) ->
Some(t) => { Some(t) => {
try!(t.render(&updated_context, r, rc)); try!(t.render(&updated_context, r, rc));
}, },
None => return Err(RenderError{ desc: "Error with the handlebars template" }) None => return Err(RenderError{ desc: "Error with the handlebars template".to_owned() })
} }
break break