Skip to content

Commit 0236e30

Browse files
committed
Merge branch 'release/1.0.4'
2 parents 85a5f6a + a68bc12 commit 0236e30

File tree

7 files changed

+35
-8
lines changed

7 files changed

+35
-8
lines changed

.gitattributes

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Auto detect text files and perform LF normalization
2+
*.livecodescript linguist-detectable=true
3+
*.livecode linguist-detectable=false
4+
5+
# Set default behaviour, in case users don't have core.autocrlf set.
6+
* text=auto
7+
8+
# Explicitly declare text files we want to always be normalized and converted
9+
# to native line endings on checkout.
10+
*.livecodescript text
11+
12+
# Declare files that will always have LF line endings on checkout.
13+
*.livecodescript text eol=CRLF
14+
15+
# Denote all files that are truly binary and should not be modified.
16+
*.png binary
17+
*.jpg binary
18+
*.jepg binary
19+
*.rev binary
20+
*.livecode binary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ The stylesheet system handles two nonstandard properties "padding" and "align".
144144

145145
## Meta
146146

147-
- Version: 1.0.3
147+
- Version: 1.0.4
148148
- Web Site: <https://revigniter.com/>
149149
- Author: [Ralf Bitter](mailto:rabit@revigniter.com)
150150

installer/stylesHelperInstaller_Scripts/stack_stylesHelperInstaller_card_id_1002.livecodescript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ end storeStylesTreeViewLCE
3232

3333

3434
command storeStylesHelper
35-
local tPlugin
35+
local tPluginFile, tPluginFileDATA
3636

3737
answer file "Locate the stylesHelper plugin:"
3838
put it into tPluginFile
@@ -50,7 +50,7 @@ end storeStylesHelper
5050

5151

5252
command installStylesTreeViewWidget
53-
local tWidgetData, tWidgetName
53+
local tWidgetData, tWidgetName, tTempWidgetPath
5454

5555
set cursor to watch
5656

library/stylesLib.livecodescript

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ script "stylesLib"
1515
--
1616
-- copyright 2021 revIgniter.com
1717
--
18-
-- Version 1.0.3
18+
-- Version 1.0.4
1919
--
2020
-- License: Apache License, Version 2.0, see http://www.apache.org/licenses/LICENSE-2.0
2121
--
@@ -92,7 +92,7 @@ local sStylesA, sOverwriteStylesheet
9292
----------------------------------------------------------------------*/
9393

9494
command syLoadStyles pStylesFilePath
95-
local tStylesFilePath
95+
local tStylesFilePath, tStylesData
9696

9797
if pStylesFilePath is empty then
9898
answer file "Select stylesheet:"
@@ -274,7 +274,7 @@ end JSONToArray
274274

275275
command syNewLook pStylesA
276276
local tStackSelectors, tCardSelectors, tNumCtrls
277-
local tCurrentPropVal, tControlID, tCurrentCdID
277+
local tCurrentPropVal, tControlID, tCurrentCdID, tObject
278278
-- put the keys of sStylesA into msg ----------- selectors
279279
-- put the keys of sStylesA[".default"] into msg ------ properties
280280
-- put displayArrayData(sStylesA) into msg

plugin/stylesHelper_Scripts/stack_stylesHelper_.livecodescript

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ end getStyleSheet
9595

9696
# INITIALIZATION, LOAD A STYLESHEET OR CREATE ONE IF THERE IS NONE
9797
command initStyles pStylesFile pEnforceLoad pPrepareTarget
98-
local tStylesFile, tSuccess
98+
local tStylesFile, tSuccess, tStylesDir
9999

100100
# HIDE SELECTORS LIST OF SELECTED CONTROL
101101
dispatch "controlSelectorsListAnim" to cd "styleSheetCd" with false
@@ -293,6 +293,8 @@ end hideBubble
293293

294294
# GET THE VALUE OF THE CLICKED KEY
295295
private function _clickedValue pPathToNode
296+
local tSuccess
297+
296298
put pPathToNode into sClickedNodeKeys
297299

298300
split pPathToNode by comma
@@ -316,6 +318,8 @@ end _clickedValue
316318
# MODIFICATIONS TO THE TARGET STACK
317319
command returnInBubble
318320
local tBubbleText, tTarget, tPathToNode, tStylesJSON
321+
local tParentNodeLine, tClosingOffset, tClosingLine
322+
local tCurrentClassData, tNewClassData
319323

320324
hide the owner of the target
321325
put the text of the target into tBubbleText
@@ -386,6 +390,8 @@ end returnInBubble
386390

387391

388392
command applyStyles pTarget pCompareChecksum
393+
local tStylesFile
394+
389395
if pTarget is empty then
390396
put the label of btn "targetBtn" into pTarget
391397
end if

plugin/stylesHelper_Scripts/stack_stylesHelper_button_id_1042.livecodescript

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Script "stack_stylesHelper_button_id_1042"
1010

1111
on mouseMove
1212
local tTargetStack, tControlNum, tLongName, tControlSytleInfoA, tName
13+
local tStrOffset, tNameEnd
1314

1415
if (the environment is "development") and (the shiftKey is down) then
1516
-- put the uStyleSelectors of the target

plugin/stylesHelper_Scripts/stack_stylesHelper_card_id_1002.livecodescript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ end returnInSelectorBubble
359359

360360

361361
command storeScript pWhich
362-
local tPlugin
362+
local tPlugin, tScriptFile, tScriptFileDATA
363363

364364
switch pWhich
365365
case "stylesLib"

0 commit comments

Comments
 (0)