Merge pull request #58 from MarcinOrlowski/flip-fix-57

Flip handling fix. Closes #57
MarcinOrlowski · Feb 20, 2023 · 30d7c55 · 30d7c55
2 parents da2f349 + 38a1d4f
commit 30d7c55
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 238 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
+* 1.6.4 (2023-02-20)
+  * Fixed incorrect handling of multiple `{flip}` entries placed in the same line in template markup [#57].
+
 * 1.6.3 (2022-09-02)
-  * Fixed layout config control buttons being rendered in unusable form [#35]
+  * Fixed layout config control buttons being rendered in unusable form [#35].
 
 * 1.6.2 (2021-12-12)
   * Fixed broken calendar view.

diff --git a/README.md b/README.md
@@ -317,5 +317,5 @@ kquitapp5 plasmashell ; kstart5 plasmashell
 
 ## License ##
 
-* Written and copyrighted &copy;2020-2022 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
+* Written and copyrighted &copy;2020-2023 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
 * Weekday Grid widget is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
diff --git a/artwork/screenshot.md b/artwork/screenshot.md
@@ -1 +1,3 @@
-plasmoidviewer window width: 774 px
+# Screenshots params
+
+Made using plasmoidviewer window with width: 774 px
diff --git a/bin/common.sh b/bin/common.sh
diff --git a/bin/configure.sh b/bin/configure.sh
diff --git a/bin/release.sh b/bin/release.sh
diff --git a/src/contents/js/DateTimeFormatter.js b/src/contents/js/DateTimeFormatter.js
@@ -2,7 +2,7 @@
  * DateTimeFormatter - JS helper library
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/datetimeformatter
  */

diff --git a/src/contents/ui/AboutDialog.qml b/src/contents/ui/AboutDialog.qml
@@ -2,7 +2,7 @@
  * Weekday Grid widget for KDE
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/weekday-plasmoid
  */

diff --git a/src/contents/ui/HtmlClock.qml b/src/contents/ui/HtmlClock.qml
@@ -1,10 +1,8 @@
 /**
  * HTML Clock Plasmoid
  *
- * Configurable HTML styled clock plasmoid.
- *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */
@@ -84,14 +82,15 @@ ColumnLayout {
 	}
 
 	function handleFlip(text) {
-		var reg = new RegExp('\{flip(:(.+)){2}\}', 'g')
+		var reg = new RegExp('\{flip:(.+?):(.+?)\}', 'gi')
 		var matches = text.match(reg)
 		if (matches !== null) {
 			var even = (new Date()).getSeconds() % 2
-			var valReg = new RegExp('^\{flip:(.+):(.+)\}$', '')
+			var valReg = new RegExp('^\{flip:(.+?):(.+?)\}$', 'i')
 			matches.forEach(function (val, idx) {
 				var valMatch = val.match(valReg)
 				text = text.replace(val, valMatch[even ? 1 : 2])
+				// console.log(`XXXXX val: ${val}, 1: ${valMatch[1]}, 2: ${valMatch[2]}`)
 			})
 		}
 

diff --git a/src/contents/ui/NotificationManager.qml b/src/contents/ui/NotificationManager.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/UpdateChecker.qml b/src/contents/ui/UpdateChecker.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/config/Calendar.qml b/src/contents/ui/config/Calendar.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2021 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/config/General.qml b/src/contents/ui/config/General.qml
@@ -3,7 +3,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/config/Layout.qml b/src/contents/ui/config/Layout.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/config/LayoutSelector.qml b/src/contents/ui/config/LayoutSelector.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/config/Tooltip.qml b/src/contents/ui/config/Tooltip.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/lib/ClickableLabel.qml b/src/contents/ui/lib/ClickableLabel.qml
@@ -2,7 +2,7 @@
  * Weekday Grid widget for KDE
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/weekday-plasmoid
  */

diff --git a/src/contents/ui/lib/CopyButton.qml b/src/contents/ui/lib/CopyButton.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */

diff --git a/src/contents/ui/lib/CopyrightLabel.qml b/src/contents/ui/lib/CopyrightLabel.qml
@@ -2,7 +2,7 @@
  * Weekday Grid widget for KDE
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/weekday-plasmoid
  */

diff --git a/src/contents/ui/lib/FontSelector.qml b/src/contents/ui/lib/FontSelector.qml
@@ -2,7 +2,7 @@
  * Weekday Grid widget for KDE
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/weekday-plasmoid
  */

diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
@@ -2,7 +2,7 @@
  * HTML Clock Plasmoid
  *
  * @author    Marcin Orlowski <mail (#) marcinOrlowski (.) com>
- * @copyright 2020-2022 Marcin Orlowski
+ * @copyright 2020-2023 Marcin Orlowski
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      https://github.com/MarcinOrlowski/html-clock-plasmoid
  */