Merge pull request #1039 from ehuss/fix-html-config

ehuss · web-flow · commit ed95252f05c2 · 2019-09-26T11:49:57.000-07:00
Fix merge conflict.
diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -441,7 +441,7 @@ fn make_data(
 
     if html_config.playpen.editable && html_config.playpen.copy_js {
         data.insert("playpen_js".to_owned(), json!(true));
-        if html.playpen.line_numbers {
+        if html_config.playpen.line_numbers {
             data.insert("playpen_line_numbers".to_owned(), json!(true));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ fn make_data(`
`441`	`441`
`442`	`442`	`if html_config.playpen.editable && html_config.playpen.copy_js {`
`443`	`443`	`data.insert("playpen_js".to_owned(), json!(true));`
`444`		`- if html.playpen.line_numbers {`
	`444`	`+ if html_config.playpen.line_numbers {`
`445`	`445`	`data.insert("playpen_line_numbers".to_owned(), json!(true));`
`446`	`446`	`}`
`447`	`447`	`}`