Merge branch 'develop'

froala · Jul 12, 2018 · 7c0a26c · 7c0a26c
2 parents 7218737 + 945bd1c
commit 7c0a26c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/FroalaEditorPlugin.php b/FroalaEditorPlugin.php
@@ -22,33 +22,27 @@ public function getName()
     }
 
     /**
-     * {@inheritdoc}
+     * @return boolean|string
      */
-    public function getVersion()
+    public function getEditorVersion()
     {
-        return '2.8.1.1';
+        return '2.8.1';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getSchemaVersion()
+    public function getVersion()
     {
-        return $this->getVersion();
+        return $this->getEditorVersion() . '.2';
     }
 
     /**
-     * @return boolean|string
+     * {@inheritdoc}
      */
-    public function getEditorVersion()
+    public function getSchemaVersion()
     {
-        $version = $this->getVersion();
-        if (false !== ($basePos = strpos($version, '-'))) {
-            $version = substr($version, 0, $basePos);
-        }
-
-        return $version;
-
+        return $this->getVersion();
     }
 
     /**

diff --git a/releases.json b/releases.json
@@ -1,4 +1,12 @@
 [
+  {
+    "version": "2.8.1.2",
+    "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.1.2.zip",
+    "date": "2018-07-12T10:35:00+02:00",
+    "notes": [
+      "[Fixed] Issue regarding loading the right Froala library based on the version number."
+    ]
+  },
   {
     "version": "2.8.1.1",
     "downloadUrl": "https://github.com/froala/Craft-Froala-WYSIWYG/archive/v2.8.1.1.zip",