Merge remote-tracking branch 'refs/remotes/origin/develop'

README.md

@@ -22,10 +22,11 @@ http://octobercms.com/plugin/samuell-contenteditor
 * file - Content block filename to edit, optional. If doesnt exists it will autocreate
 * fixture - Fixed name for content block, useful for inline texts (headers, spans...)
 * tools - List of enabled tools, comma separated (for all default tools use `*` or leave empty to get all tools defined in settings of Content Editor)
+* class - Class for element, mostly useful for fixtures
 
 *Example:*
 ```
-{% component 'contenteditor' file="filename_in_content.htm" fixture="h3" tools="bold,italic" %}
+{% component 'contenteditor' file="filename_in_content.htm" fixture="h3" tools="bold,italic" class="my-class" %}
 ```
 
 ##### Tools list

components/ContentEditor.php

@@ -14,6 +14,7 @@ class ContentEditor extends ComponentBase
     public $file;
     public $fixture;
     public $tools;
+    public $class;
     public $buttons;
     public $palettes;
 
@@ -46,7 +47,7 @@ public function defineProperties()
                 'title'       => 'List of enabled tools',
                 'description' => 'List of enabled tools for selected content (for all use *)',
                 'default'     => ''
-            ]
+            ],
         ];
     }
 
@@ -73,11 +74,12 @@ public function onRun()
     public function onRender()
     {
         $this->additional_styles = Settings::renderCss();
-        $this->renderCount += 1;
+        $this->renderCount = $this->page['renderCount'] += 1;
 
         $this->file = $this->setFile($this->property('file'));
         $this->fixture = $this->property('fixture');
         $this->tools = $this->property('tools');
+        $this->class = $this->property('class');
 
         $content = $this->getFile();
 

components/contenteditor/default.htm

@@ -2,7 +2,8 @@
     {% if __SELF__.fixture %}data-fixture data-ce-tag="p"{% else %}data-editable{% endif %}
     data-component="{{ __SELF__ }}::onSave"
     data-file="{{ __SELF__.file }}"
-    data-tools="{{ __SELF__.tools }}">
+    data-tools="{{ __SELF__.tools }}"
+    {% if __SELF__.class %}class="{{ class }}"{% endif %}>
     {{ __SELF__.content|raw }}
 </{% if __SELF__.fixture %}{{ __SELF__.fixture }}{% else %}div{% endif %}>
 

components/contenteditor/render.htm

@@ -1,5 +1,5 @@
 
-{% if __SELF__.fixture %}<{{ __SELF__.fixture }}>{% endif %}
+{% if __SELF__.fixture %}<{{ __SELF__.fixture }} {% if __SELF__.class %}class="__SELF__.class"{% endif %}>{% endif %}
     {{ content|raw }}
 {% if __SELF__.fixture %}</{{ __SELF__.fixture }}>{% endif %}
 

models/Settings.php

@@ -16,12 +16,14 @@ class Settings extends Model
 
     const CACHE_KEY = 'samuell:contenteditor.additional_styles';
 
-    public function initSettingsData() {
+    public function initSettingsData()
+    {
         $this->additional_styles = File::get(plugins_path().'/samuell/contenteditor/assets/additional-css.css');
     }
 
     // list of buttons
-    public function getEnabledButtonsOptions() {
+    public function getEnabledButtonsOptions()
+    {
         return [
             'bold'           => 'Bold (b)',
             'italic'         => 'Italic (i)',
@@ -54,7 +56,8 @@ public function getEnabledButtonsOptions() {
     }
 
     // list of allowed tags
-    public function getAllowedTagsOptions() {
+    public function getAllowedTagsOptions()
+    {
         return [
             'p',
             'img',
@@ -95,6 +98,7 @@ public static function renderCss()
         }
         return $customCss;
     }
+
     public static function compileCss()
     {
         $parser = new Less_Parser(['compress' => true]);

updates/version.yaml

@@ -22,3 +22,6 @@
 1.0.8: Fix BackendAuth issue for build 420
 1.0.9: Fix missing fixture in render component
 1.1.0: Fix SELF prefix for fixtures
+1.2.0: 
+    - Support classes for fixture
+    - Fix renderCount if component using other alias name