Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit d33712b

Browse files
author
Monte Goulding
authored
Merge pull request #1881 from livecode/bugfix-20841
[[ Bug 20841 ]] Remove duplicate handlers
2 parents 771cdda + a4caf23 commit d33712b

7 files changed

Lines changed: 137 additions & 203 deletions

Toolset/libraries/revbackscriptlibrary.livecodescript

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,6 @@ on newPlayer
731731
if not gREVSuppressMessages or (gREVSuppressMessages and revOKTarget()) then pass newPlayer
732732
end newPlayer
733733

734-
on newGroup
735-
selectedObjectChanged
736-
set the cREVGeneral["revUniqueID"] of the target to the milliseconds
737-
revUpdateAOControls
738-
if not gREVSuppressMessages or (gREVSuppressMessages and revOKTarget()) then pass newGroup
739-
end newGroup
740-
741734
on newCard
742735
if there is a stack "revApplicationOverview" then
743736
if the mode of stack "revApplicationOverview" is not 0

Toolset/libraries/revidelibrary.8.livecodescript

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3891,18 +3891,6 @@ on revIDERelayerControl pControl, pLayerNumber, pCard
38913891
return the long id of tName
38923892
end revIDERelayerControl
38933893

3894-
on revIDEMoveControl pControl, pNewCard, pLayerNumber
3895-
local tNewControl
3896-
lock messages
3897-
copy pControl to pNewCard
3898-
put the long id of it into tNewControl
3899-
3900-
delete pControl
3901-
3902-
revIDESetPropertyOfObject tNewControl, "layer", pLayerNumber
3903-
unlock messages
3904-
end revIDEMoveControl
3905-
39063894
on revIDEMoveCard pCard, pNewStack
39073895
local tNewCard
39083896
lock messages
@@ -12360,10 +12348,6 @@ on revIDEFindMoreWidgets
1236012348
unlock screen
1236112349
end revIDEFindMoreWidgets
1236212350

12363-
command revIDESetEdited pStackName
12364-
revSetEdited pStackName
12365-
end revIDESetEdited
12366-
1236712351
command ideShowUpgradeOptions
1236812352
if ideCanShowUpgradeOptions() then
1236912353
lock screen

Toolset/libraries/revinitialisationlibrary.livecodescript

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,3 @@ command revInternal_SetCLASSPATH
177177

178178
put tClasspath into $CLASSPATH
179179
end revInternal_SetCLASSPATH
180-
181-
function revInternal__LoadedLibraryStackName pLibraryName
182-
return sLoadedLibraries[pLibraryName]
183-
end revInternal__LoadedLibraryStackName

Toolset/libraries/revnomessageslibrary.livecodescript

Lines changed: 127 additions & 140 deletions
Large diffs are not rendered by default.

Toolset/palettes/behaviors/revpalettebehavior.livecodescript

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,12 @@ command setEnabledOfFrameItem pName, pValue
101101
put __frameItemNameToIndex(pName) into tIndex
102102
if tIndex is not a number then exit setEnabledOfFrameItem
103103

104+
lock screen
105+
lock messages
104106
put pValue into sData[tIndex]["enabled"]
105107
generateFrame
108+
unlock messages
109+
unlock screen
106110
end setEnabledOfFrameItem
107111

108112
on toggleFrameItem pName, pValue
@@ -129,32 +133,6 @@ on hiliteFrameItem pName
129133
unlock screen
130134
end hiliteFrameItem
131135

132-
on disableFrameItem pName
133-
local tIndex
134-
put __frameItemNameToIndex(pName) into tIndex
135-
if tIndex is not a number then exit disableFrameItem
136-
137-
lock screen
138-
lock messages
139-
put false into sData[tIndex]["enabled"]
140-
generateFrame
141-
unlock messages
142-
unlock screen
143-
end disableFrameItem
144-
145-
on enableFrameItem pName
146-
local tIndex
147-
put __frameItemNameToIndex(pName) into tIndex
148-
if tIndex is not a number then exit enableFrameItem
149-
150-
lock screen
151-
lock messages
152-
put true into sData[tIndex]["enabled"]
153-
generateFrame
154-
unlock messages
155-
unlock screen
156-
end enableFrameItem
157-
158136
on clearFrameData
159137
put empty into sData
160138
end clearFrameData

Toolset/palettes/reverrordisplay.livecodescript

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ on openStack
9696
end openStack
9797

9898
on closeStack
99+
if the enabled of btn "Ignore" of group "errorDisplay" of me then
100+
set the traceAbort to true
101+
set the traceReturn to true
102+
end if
103+
99104
revIDEUnsubscribeAll
100105
updateStoredRect
101106
pass closeStack
@@ -112,16 +117,6 @@ end revCloseErrorDialogDo
112117

113118
local lExit
114119

115-
on closeStack
116-
if the enabled of btn "Ignore" of group "errorDisplay" of me then
117-
set the traceAbort to true
118-
set the traceReturn to true
119-
end if
120-
121-
# OK-2007-07-02: Bug 5203
122-
pass closeStack
123-
end closeStack
124-
125120
on returnInField
126121
returnKey
127122
end returnInField

notes/bugfix-20841.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Remove duplicate handlers from IDE

0 commit comments

Comments
 (0)