From 43ca4c4785c83b444a76a11b6305f42be3e689cf Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Mon, 11 Sep 2017 12:44:50 +0100 Subject: [PATCH 1/2] Quill renderer * Switched to v1 of Quill renderer, usage incorrect. --- composer.json | 2 +- composer.lock | 23 +++++++++++-------- .../RichText/scripts/rich-text.phtml | 1 + .../Model/View/Page/Content/BlogPost.php | 9 ++++---- .../Model/View/Page/Content/RichText.php | 9 ++++---- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index e33af877b..718431c03 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,6 @@ "license": "MIT", "homepage": "http://dlayer.com/", "require": { - "deanblackborough/php-quill-renderer": "v0.*" + "deanblackborough/php-quill-renderer": "v1.*" } } diff --git a/composer.lock b/composer.lock index 572ffda15..554d3fd63 100644 --- a/composer.lock +++ b/composer.lock @@ -4,32 +4,32 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "332eb4a619bc153c736ffa4368df8c12", + "content-hash": "f1f5ecf89015904e6a8bf42498d831f4", "packages": [ { "name": "deanblackborough/php-quill-renderer", - "version": "v0.40.0", + "version": "v1.01.0", "source": { "type": "git", "url": "https://github.com/deanblackborough/php-quill-renderer.git", - "reference": "56dc37c6a69c098bac918684d8e6376f91318612" + "reference": "2fd6880b9a596f6ad06aaec98d5b88c69263bb74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/deanblackborough/php-quill-renderer/zipball/56dc37c6a69c098bac918684d8e6376f91318612", - "reference": "56dc37c6a69c098bac918684d8e6376f91318612", + "url": "https://api.github.com/repos/deanblackborough/php-quill-renderer/zipball/2fd6880b9a596f6ad06aaec98d5b88c69263bb74", + "reference": "2fd6880b9a596f6ad06aaec98d5b88c69263bb74", "shasum": "" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6" }, "type": "library", "autoload": { - "psr-0": { - "DBlackborough\\Quill": "src" + "psr-4": { + "DBlackborough\\Quill\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -42,14 +42,17 @@ "email": "dean@g3d-development.com" } ], - "description": "Render quill insert deltas to HTML", + "description": "Render quill insert deltas to HTML and soon markdown", "homepage": "https://github.com/deanblackborough/php-quill-renderer", "keywords": [ + "delta", "html", + "parse", "quill", + "quilljs", "renderer" ], - "time": "2017-03-10T17:08:52+00:00" + "time": "2017-09-04T18:39:25+00:00" } ], "packages-dev": [], diff --git a/library/Dlayer/DesignerTool/ContentManager/RichText/scripts/rich-text.phtml b/library/Dlayer/DesignerTool/ContentManager/RichText/scripts/rich-text.phtml index 54dac6014..e55be5acd 100644 --- a/library/Dlayer/DesignerTool/ContentManager/RichText/scripts/rich-text.phtml +++ b/library/Dlayer/DesignerTool/ContentManager/RichText/scripts/rich-text.phtml @@ -25,6 +25,7 @@ ['bold', 'italic', 'underline', 'strike'], ['link'], [{ 'script': 'sub'}, { 'script': 'super' }], + [{ 'list': 'ordered'}, { 'list': 'bullet' }], ['clean'] ] }, diff --git a/library/Dlayer/Model/View/Page/Content/BlogPost.php b/library/Dlayer/Model/View/Page/Content/BlogPost.php index 824364b73..ed0a755ea 100644 --- a/library/Dlayer/Model/View/Page/Content/BlogPost.php +++ b/library/Dlayer/Model/View/Page/Content/BlogPost.php @@ -57,12 +57,11 @@ public function data($site_id, $page_id, $id) $result['date'] = date($result['format'], strtotime($bits['1'])); $result['content'] = $bits[2]; - $renderer = new \DBlackborough\Quill\Renderer\Html(); - - if ($renderer->load($result['content']) === true) { - $result['content'] = $renderer->render(); + try { + $quill = new \DBlackborough\Quill\Render($result['content'], 'HTML'); + $result['content'] = $quill->render(); return $result; - } else { + } catch (\Exception $e) { return false; } } else { diff --git a/library/Dlayer/Model/View/Page/Content/RichText.php b/library/Dlayer/Model/View/Page/Content/RichText.php index 5612c9c73..7e593d8d0 100644 --- a/library/Dlayer/Model/View/Page/Content/RichText.php +++ b/library/Dlayer/Model/View/Page/Content/RichText.php @@ -43,12 +43,11 @@ public function data($site_id, $page_id, $id) $result = $stmt->fetch(); if ($result !== false) { - $renderer = new \DBlackborough\Quill\Renderer\Html(); - - if ($renderer->load($result['content']) === true) { - $result['content'] = $renderer->render(); + try { + $quill = new \DBlackborough\Quill\Render($result['content'], 'HTML'); + $result['content'] = $quill->render(); return $result; - } else { + } catch (\Exception $e) { return false; } } else { From 734bd521dbffd27ad6c337f303649d611c167084 Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Mon, 11 Sep 2017 18:48:29 +0100 Subject: [PATCH 2/2] v1.17 * Release v1.17 --- CHANGELOG.md | 3 ++- .../modules/dlayer/views/scripts/index/index.phtml | 3 ++- composer.lock | 10 +++++----- .../ContentManager/BlogPost/scripts/blog-post.phtml | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 135ebec30..a164ce435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,11 @@ Full changelog for Dlayer since the v1.00 release. -## v1.17: +## v1.17: 12th September 2011 * New styling table for content items, stores all defined styles, no need for a table per styling group. [Refactoring] * Cleaned up tools, removed redundant model classes and moved around shared classes, now more apparent if they relate to content or not. [Refactoring] +* Now using Quill PHP renderer v1.01.1, enables support for lists in text areas. ## v1.16: 12th March 2017 diff --git a/application/modules/dlayer/views/scripts/index/index.phtml b/application/modules/dlayer/views/scripts/index/index.phtml index cf845a2d0..2b6aac912 100644 --- a/application/modules/dlayer/views/scripts/index/index.phtml +++ b/application/modules/dlayer/views/scripts/index/index.phtml @@ -31,11 +31,12 @@
-

v1.17 Not yet named (In progress)

+

v1.17 Quill and refactoring (12th September 2017)

  • New styling table for content items, stores all defined styles, no need for a table per styling group. [Refactoring]
  • Cleaned up tools, removed redundant model classes and moved around shared classes, now more apparent if they relate to content or not. [Refactoring]
    • +
  • Now using Quill PHP renderer v1.01.1, enables support for lists in text areas.

v1.16 Horizontal rule & styling (12th March 2017)

diff --git a/composer.lock b/composer.lock index 554d3fd63..e77284b12 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "deanblackborough/php-quill-renderer", - "version": "v1.01.0", + "version": "v1.01.1", "source": { "type": "git", "url": "https://github.com/deanblackborough/php-quill-renderer.git", - "reference": "2fd6880b9a596f6ad06aaec98d5b88c69263bb74" + "reference": "dd3fcade9987e94182e9faec2aa1ac3628338885" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/deanblackborough/php-quill-renderer/zipball/2fd6880b9a596f6ad06aaec98d5b88c69263bb74", - "reference": "2fd6880b9a596f6ad06aaec98d5b88c69263bb74", + "url": "https://api.github.com/repos/deanblackborough/php-quill-renderer/zipball/dd3fcade9987e94182e9faec2aa1ac3628338885", + "reference": "dd3fcade9987e94182e9faec2aa1ac3628338885", "shasum": "" }, "require": { @@ -52,7 +52,7 @@ "quilljs", "renderer" ], - "time": "2017-09-04T18:39:25+00:00" + "time": "2017-09-11T14:00:03+00:00" } ], "packages-dev": [], diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/scripts/blog-post.phtml b/library/Dlayer/DesignerTool/ContentManager/BlogPost/scripts/blog-post.phtml index 54dac6014..e55be5acd 100644 --- a/library/Dlayer/DesignerTool/ContentManager/BlogPost/scripts/blog-post.phtml +++ b/library/Dlayer/DesignerTool/ContentManager/BlogPost/scripts/blog-post.phtml @@ -25,6 +25,7 @@ ['bold', 'italic', 'underline', 'strike'], ['link'], [{ 'script': 'sub'}, { 'script': 'super' }], + [{ 'list': 'ordered'}, { 'list': 'bullet' }], ['clean'] ] },