Merge pull request #245 from deanblackborough/master

Quill v1.01.1

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
 

application/modules/dlayer/views/scripts/index/index.phtml

@@ -31,11 +31,12 @@
 	</div>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        <h3><span class="label label-success">v1.17</span> Not yet named <small class="text-muted">(In progress)</small></h3>
+        <h3><span class="label label-success">v1.17</span> Quill and refactoring <small class="text-muted">(12th September 2017)</small></h3>
 
         <ul>
             <li>New styling table for content items, stores all defined styles, no need for a table per styling group. [Refactoring]</li>
             <li>Cleaned up tools, removed redundant model classes and moved around shared classes, now more apparent if they relate to content or not. [Refactoring]</li>
+            <li>Now using Quill PHP renderer v1.01.1, enables support for lists in text areas.</li>
         </ul>
 
         <h3><span class="label label-default">v1.16</span> Horizontal rule & styling <small class="text-muted">(12th March 2017)</small></h3>

composer.json

@@ -4,6 +4,6 @@
     "license": "MIT",
     "homepage": "http://dlayer.com/",
     "require": {
-        "deanblackborough/php-quill-renderer": "v0.*"
+        "deanblackborough/php-quill-renderer": "v1.*"
     }
 }

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']
             ]
         },

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']
             ]
         },

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 {

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 {