Merge branch 'release/1.0.1'

Author: revig

README.md

@@ -144,7 +144,7 @@ The stylesheet system handles two nonstandard properties "padding" and "align".
 
 ## Meta
 
-- Version: 1.0.0  
+- Version: 1.0.1  
 - Web Site: <https://revigniter.com/>  
 - Author:  [Ralf Bitter](mailto:rabit@revigniter.com)  
 

installer/stylesHelperInstaller.livecode

@@ -15,7 +15,7 @@ script "stylesLib"
 --
 -- copyright 2021 revIgniter.com
 --
--- Version 1.0.0
+-- Version 1.0.1
 --
 -- License: Apache License, Version 2.0, see http://www.apache.org/licenses/LICENSE-2.0
 --
@@ -93,7 +93,7 @@ local sStylesA, sOverwriteStylesheet
 
 command syLoadStyles pStylesFilePath
    local tStylesFilePath
-   
+
 	 if pStylesFilePath is empty then
 		 answer file "Select stylesheet:"
 		 put it into tStylesFilePath
@@ -103,7 +103,7 @@ command syLoadStyles pStylesFilePath
 
 	 put url ("file:" & tStylesFilePath) into tStylesData
 	 put textEncode(tStylesData,"UTF-8") into tStylesData
-   
+
 		 try
 			 put JSONToArray(tStylesData) into sStylesA
 		 catch e
@@ -124,9 +124,9 @@ end syLoadStyles
 --| COMMAND syApplyStyles
 --|
 --| Author: rabit
---| Version:  1.0
+--| Version:  1.1
 --| Created: 2021-03-19
---| Last Mod: 2021-03-19
+--| Last Mod: 2021-05-19
 --| Requires: syResizeElement
 --|
 --| Summary: Loop through the list of selectors of a control and apply the appropriate property values.
@@ -140,31 +140,32 @@ end syLoadStyles
 
 command syApplyStyles pControlID
 	local tSelectors, tSelector, tProp, tAlignment, tCurrentPropVal
-   
+  local tControlPropsA, tPropSynos
+
 	put the uStyleSelectors of control id pControlID into tSelectors
-   
+
 	if tSelectors <> empty then
-      
+
 		# GET ALIGNMENT (LEFT, RIGHT OR CENTER)
 		put empty into tAlignment
 		repeat for each item tSelector in tSelectors
 			if sStylesA[tSelector] is an array then
 				if sStylesA[tSelector]["align"] <> empty then
 					if sStylesA[tSelector]["align"] is not among the items of "left,right,center" then
 						syErrorHandling "Wrong format, custom style property" && quote & "align" & quote && "could not be set!"
-						
+
 						put empty into sStylesA[tSelector]["align"]
 						# SET FLAG TO RESAVE JSON FILE USING CURRENT VALUE
 						put TRUE into sOverwriteStylesheet
-						
+
 					else
 						put sStylesA[tSelector]["align"] into tAlignment
 					end if -- if sStylesA[tSelector]["align"] is not among the items of "left,right,center"
 				end if -- if sStylesA[tSelector]["align"] <> empty
 			end if -- if sStylesA[tSelector] is an array
 		end repeat
 		##
-      
+
 		repeat for each item tSelector in tSelectors
 			if sStylesA[tSelector] is an array then
 				repeat for each key tProp in sStylesA[tSelector]
@@ -177,26 +178,42 @@ command syApplyStyles pControlID
 					default
 					# SET STANDARD LIVECODE PROPERTIES
 						if tProp <> "align" then
-										
+
+              # CHECK IF THE PROPERTY NAME IS VALID
+              put the properties of control id pControlID into tControlPropsA
+              if tProp is not among the lines of the keys of tControlPropsA then
+                put "foregroundColor,firstcolor,textcolor,thumbcolor,fillfore,penfore,forecolor,backgroundColor,secondcolor,backcolor" into tPropSynos
+
+                if tProp is not among the items of tPropSynos then
+                  delete variable sStylesA[tSelector][tProp]
+                  answer warning "Invalid property name:" && quote & tProp & quote & "! Property name removed."
+
+                  # SET FLAG TO RESAVE JSON FILE
+                  put TRUE into sOverwriteStylesheet
+
+                  next repeat
+                end if
+              end if -- if tProp is not among the lines of the keys of tControlPropsA
+
 							put the tProp of control id pControlID into tCurrentPropVal
-										
+
 							try
 								set the tProp of control id pControlID to sStylesA[tSelector][tProp]
 							catch e
 							# NOTE debugging
 								syErrorHandling "Wrong format, property could not be set!"
-											
+
 								set the tProp of control id pControlID to tCurrentPropVal
 								put tCurrentPropVal into sStylesA[tSelector][tProp]
-											
+
 								# SET FLAG TO RESAVE JSON FILE USING CURRENT VALUE
 								put TRUE into sOverwriteStylesheet
 							end try
-										
+
 						end if -- if tProp <> "align"
 					end switch
 				end repeat
-			end if -- if sStylesA[tSelector] is an array 
+			end if -- if sStylesA[tSelector] is an array
 		end repeat
 	end if
 end syApplyStyles
@@ -211,7 +228,7 @@ end syApplyStyles
 --| Author: LiveCode
 --|
 --| Summary: Parse JSON to a LiveCode array.
---| 
+--|
 --| Format:  JSONToArray(param1)
 --|
 --| Parameters: string <pJSON>
@@ -259,49 +276,49 @@ command syNewLook pStylesA
    -- put the keys of sStylesA[".default"] into msg ------ properties
    -- put displayArrayData(sStylesA) into msg
    -- put displayArrayData(sStylesA[".default"]["padding"]) into msg
-   
+
    if pStylesA <> empty then
       put pStylesA into sStylesA
    end if
-   
-	 put the uStyleSelectors of this stack into tStackSelectors	 
+
+	 put the uStyleSelectors of this stack into tStackSelectors
 	 put the id of this cd into tCurrentCdID
-	 
+
    lock screen
 	 lock messages
-	 
+
 	 # STACK
 	 if tStackSelectors <> empty then
 		 put the long id of this stack into tObject
 		 _syApplyStylesToStackOrCard tObject, tStackSelectors
 	 end if
-	 
-	 
+
+
 	 repeat with i = 1 to the number of lines of the cardIDs of this stack
 		 go cd id (line i of the cardIDs of this stack)
-		 
+
 		 put the uStyleSelectors of this cd into tCardSelectors
 		 put the number of controls of this cd into tNumCtrls
-	 
+
 		 # CARD
 		 if tCardSelectors <> empty then
 			 put the long id of this cd into tObject
 			 _syApplyStylesToStackOrCard tObject, tCardSelectors
 		 end if
-	 
+
 		 # CONTROLS
 		 repeat with tCtrl = 1 to tNumCtrls
 			 put the id of control tCtrl into tControlID
 			 syApplyStyles tControlID
 		 end repeat
 
 	 end repeat
-      
+
 	 go cd id tCurrentCdID
-	 
+
 	 unlock messages
    unlock screen
-	 
+
 	 # SAVE CORRECTED JSON FILE, IN CASE THE PROPERTY FORMAT WAS INCORRECT
 	 if sOverwriteStylesheet is TRUE then
 		 put FALSE into sOverwriteStylesheet
@@ -337,7 +354,7 @@ end syNewLook
 
 private command _syApplyStylesToStackOrCard pObject pSelectors
 	local tSelector, tProp, tCurrentPropVal
-	
+
   repeat for each item tSelector in pSelectors
      if sStylesA[tSelector] is an array then
         repeat for each key tProp in sStylesA[tSelector]
@@ -347,10 +364,10 @@ private command _syApplyStylesToStackOrCard pObject pSelectors
 						set the tProp of pObject to sStylesA[tSelector][tProp]
 					catch e
 			       syErrorHandling "Wrong format, property could not be set!"
-						
+
 						set the tProp of pObject to tCurrentPropVal
 						put tCurrentPropVal into sStylesA[tSelector][tProp]
-						
+
 						# SET FLAG TO RESAVE JSON FILE USING CURRENT VALUE
 						put TRUE into sOverwriteStylesheet
 					end try
@@ -387,72 +404,72 @@ end _syApplyStylesToStackOrCard
 command syResizeElement pControlID, pPadding, pAlignment
    local tTextSize, tMargins, tTextWidth, tRight, tLeft
    local tHorizontalPadding, tLabelShortName
-   
+
    if pAlignment is empty then
       put "center" into pAlignment
    end if
-   
+
 	 # GET TEXT SIZE OF CONTROL
    switch word 1 of the long name of control id pControlID
       case "field"
          if the dontWrap of control id pControlID is true then
             put measureText(the text of control id pControlID, control id pControlID, "size") into tTextSize
          else
-            
+
          end if
-         
+
          break
       case "button"
          put measureText(the label of control id pControlID, control id pControlID, "size") into tTextSize
-         
+
          break
       default
 			# OTHER?
          -- default code
    end switch
 	 ##
-   
+
    # HORIZONTAL PADDING
    put the margins of control id pControlID into tMargins
    if tMargins <> empty then
       if (item 1 of pPadding) < tMargins then
          put tMargins into item 1 of pPadding
       end if
    end if
-   
+
    put item 1 of tTextSize into tTextWidth
    put 2 * (item 1 of pPadding) into tHorizontalPadding
    ##
-	 
+
 	 # TODO vertical padding
 	 ##
-   
+
 	 # SET RECT OF CONTROL
    switch pAlignment
       case "right"
          put the right of control id pControlID into tRight
          put (tRight - tTextWidth) - tHorizontalPadding into tLeft
-         
+
          break
       case "left"
          put the left of control id pControlID into tLeft
          put (tLeft + tTextWidth) + tHorizontalPadding into tRight
-         
+
          break
       case "center"
          set the width of control id pControlID to (tTextWidth + tHorizontalPadding)
          put the right of control id pControlID into tRight
          put left of control id pControlID into tLeft
-         
+
          break
       default
 			# OTHER?
          syErrorHandling "Value of property" && quote & "align" & quote && "has wrong format:" && pAlignment & ". Use left, right or center."
 				 exit syResizeElement
    end switch
-   
+
    set the rect of control id pControlID to tLeft, the top of control id pControlID, tRight, the bottom of control id pControlID
-   
+
    # ALIGN LINKED LABEL IF ANY
    if (word 1 of the long name of control id pControlID is "button") and (the uLabel of btn id pControlID <> empty) then
       put the uLabel of btn id pControlID into tLabelShortName
@@ -496,4 +513,4 @@ end syErrorHandling
 
 
 --| END OF stylesLib.livecodescript
-----------------------------------------------------------------------
+----------------------------------------------------------------------