Merge branch 'master' into 'develop'

Master

See merge request !324

CHANGELOG.md

@@ -53,6 +53,30 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.3.1
+--------------
+
+Date: 21.03.2021
+
+Notes
+^^^^^
+
+* Custom QFQ Function:
+
+  * Call QFQ function from inside a report, at any place, as often as needed. The QFQ function code will be parsed only
+    one time. Variables will be replaced in time.
+  * Based on QFQ function: a new download source can be specified : source:<function name>
+
+Features
+^^^^^^^^
+* #11998 / Custom QFQ-Function
+* #12015 / Use Advanced FormEditor
+
+Bug Fixes
+^^^^^^^^^
+
+* Bug with empty Fabric string fixed
+
 Version 21.3.0
 --------------
 

Documentation-develop/NewVersion.md

@@ -44,7 +44,7 @@ Neue Versionsnummer
 
    **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
 
-   **Auto**: ./setVersion.sh 21.3.0
+   **Auto**: ./setVersion.sh 21.3.1
 
    Manuell:
      * extension/Documentation/_make/conf.py: release, version-
@@ -59,12 +59,12 @@ Neue Versionsnummer
 
    * Commit & Push new version changes to master branch:
 
-     New version 21.3.0
+     New version 21.3.1
 
 7) **New Tag**:
 
-   git tag v21.3.0
-   git push -u origin v21.3.0
+   git tag v21.3.1
+   git push -u origin v21.3.1
 
 8) **Merge 'master' into 'develop'**
 

Documentation/Release.rst

@@ -53,6 +53,30 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.3.1
+--------------
+
+Date: 21.03.2021
+
+Notes
+^^^^^
+
+* Custom QFQ Function:
+
+  * Call QFQ function from inside a report, at any place, as often as needed. The QFQ function code will be parsed only
+    one time. Variables will be replaced in time.
+  * Based on QFQ function: a new download source can be specified : source:<function name>
+
+Features
+^^^^^^^^
+* #11998 / Custom QFQ-Function
+* #12015 / Use Advanced FormEditor
+
+Bug Fixes
+^^^^^^^^^
+
+* Bug with empty Fabric string fixed
+
 Version 21.3.0
 --------------
 

Documentation/Settings.cfg

@@ -22,7 +22,7 @@
 
 project = QFQ - Quick Form Query
 version = 21.3
-release = 21.3.0
+release = 21.3.1
 t3author = Carsten Rose
 copyright = since 2017 by the author
 

Documentation/conf.py

@@ -64,7 +64,7 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger'
 # The short X.Y version.
 version = '21.3'
 # The full version, including alpha/beta/rc tags.
-release = '21.3.0'
+release = '21.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

extension/RELEASE.txt

@@ -53,6 +53,30 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.3.1
+--------------
+
+Date: 21.03.2021
+
+Notes
+^^^^^
+
+* Custom QFQ Function:
+
+  * Call QFQ function from inside a report, at any place, as often as needed. The QFQ function code will be parsed only
+    one time. Variables will be replaced in time.
+  * Based on QFQ function: a new download source can be specified : source:<function name>
+
+Features
+^^^^^^^^
+* #11998 / Custom QFQ-Function
+* #12015 / Use Advanced FormEditor
+
+Bug Fixes
+^^^^^^^^^
+
+* Bug with empty Fabric string fixed
+
 Version 21.3.0
 --------------
 

extension/ext_emconf.php

@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
     'dependencies' => 'fluid,extbase',
     'clearcacheonload' => true,
     'state' => 'stable',
-    'version' => '21.3.0',
+    'version' => '21.3.1',
     'constraints' => [
         'depends' => [
             'typo3' => '7.0.0-10.9.99',

javascript/src/Plugins/qfq.fabric.js

@@ -336,15 +336,15 @@ $(function (n) {
                 that.userChangePossible = true;
             });
         } else {
-            if(!isReadOnly) { 
-            	that.setBackground();
+            that.setBackground();
+            if(!isReadOnly) {
 	        that.setBrush();
             }
             that.canvas.renderAll();
             that.userChangePossible = true;
             this.history.put(this.canvas.toJSON());
         }
-        var defaultColor = $fabricElement.data('fabric-color') || false;
+        var defaultColor = this.parentElement.data('fabric-color') || false;
         if (defaultColor) {
             this.setColor(defaultColor);
         }

version

-21.3.0
+21.3.1