From aa73b8283291f4dc007fe45c387058fd2bc9c05a Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Tue, 1 Mar 2016 19:00:29 -0800 Subject: [PATCH] Implemented Preview button and states abstraction for toolbar --- classes/controller.php | 2 +- themes/grav/app/forms/fields/editor.js | 37 +++- .../grav/app/forms/fields/editor/buttons.js | 162 ++++++++++++------ themes/grav/css-compiled/template.css | 2 +- themes/grav/css-compiled/template.css.map | 2 +- themes/grav/js/admin.min.js | 20 +-- themes/grav/js/vendor.min.js | 26 +-- themes/grav/scss/template/_editor.scss | 74 +++++--- .../forms/fields/markdown/markdown.html.twig | 1 + 9 files changed, 225 insertions(+), 101 deletions(-) diff --git a/classes/controller.php b/classes/controller.php index 68aa2dc0..556a4681 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -750,7 +750,7 @@ class AdminController $html = $page->content(); - $this->admin->json_response = ['status' => 'success', 'message' => $html]; + $this->admin->json_response = ['status' => 'success', 'preview' => $html]; } catch (\Exception $e) { $this->admin->json_response = ['status' => 'error', 'message' => $e->getMessage()]; diff --git a/themes/grav/app/forms/fields/editor.js b/themes/grav/app/forms/fields/editor.js index 9a5ace5b..576664c5 100644 --- a/themes/grav/app/forms/fields/editor.js +++ b/themes/grav/app/forms/fields/editor.js @@ -110,10 +110,16 @@ export class Toolbar { static templates() { return { navigation: ` -
+
+
+
+
`, states: ` -
+
+
+
+
` }; } @@ -135,14 +141,35 @@ export class Toolbar { } renderButtons() { - this.ui.navigation.empty().append('