Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bd9fc27
[[ Bug 20094 ]] Execute msg box if it compiles
montegoulding Apr 3, 2018
f86a6fd
[Bug 21174] Ensure "Sample Stacks" do show up in menu "Windows"
livecodepanos Apr 9, 2018
899123e
Update bugfix-21174.md
livecodepanos Apr 9, 2018
5b59291
[[ DataGridGuide ]] Remove trailing header #s
livecodeali Apr 11, 2018
489b8b4
[Bug 21167] Ensure Replace history is remembered
livecodepanos Apr 11, 2018
6245454
[21167] Added bugfix note
livecodepanos Apr 11, 2018
e19f62f
[21169] Ensure splash screen always hides on Windows
livecodepanos Apr 11, 2018
504ffb6
[21169] Added bugfix note
livecodepanos Apr 11, 2018
61bb868
[[ Bug 21172 ]] Fix revMail on mobile
bwmilby Apr 12, 2018
79518f0
[Bug 21176] Make sure Upgrade Options can always be shown
livecodepanos Apr 12, 2018
553168d
[21176] Added bugfix note
livecodepanos Apr 12, 2018
6a7ffd5
Merge pull request #1961 from livecode/bugfix-21176
livecodeali Apr 18, 2018
9a29725
Merge pull request #1960 from bwmilby/bwm-bugfix-21172
livecodeali Apr 18, 2018
ceb499a
Merge pull request #1959 from livecode/bugfix-21169
livecodeali Apr 18, 2018
d60f2ce
Merge pull request #1957 from livecode/bugfix-21167
livecodeali Apr 18, 2018
f685e7f
Merge pull request #1948 from montegoulding/bugfix-20094
livecodeali Apr 18, 2018
17c5c05
Fixed typo causing runtime error
livecodepanos Apr 19, 2018
1ccb221
Fix runtime error preventing splash screen from hiding
livecodepanos Apr 19, 2018
75f7b92
Added function to check if an IDE stack should appear in "Window" list
livecodepanos Apr 19, 2018
097adc1
Merge pull request #1964 from livecode/bugfix-21169_part2
livecodepanos Apr 19, 2018
a013f73
Merge pull request #1956 from livecode/bugfix-21174
livecodepanos Apr 19, 2018
e758a1c
Merge pull request #1963 from livecode/bugfix-21176_part2
livecodepanos Apr 19, 2018
9421a12
[[ Bug 21202 ]] Fix deselection of next find after replace
montegoulding Apr 20, 2018
b68ef8c
[[ Bug 21179 ]] Add show documentation to extension context menu
livecodeali Apr 21, 2018
7de3bb9
Merge pull request #1966 from montegoulding/bugfix-21202
Apr 23, 2018
5c25591
[[ Bug 21206 ]] Fix error opening msg box from SE
montegoulding Apr 23, 2018
c3d923f
Merge pull request #1967 from livecode/bugfix-21179
Apr 25, 2018
4436800
Merge pull request #1958 from livecode/docs-dg_markdown
Apr 25, 2018
623ae8e
[Bug 21222] Ensure File->Close is disabled when topstack=revMenubar
livecodepanos May 7, 2018
8afe4f4
[21222] Added bugfix note
livecodepanos May 7, 2018
527ec87
[Bug 18585] Ensure Dictionary traps cmd+A
livecodepanos May 7, 2018
d9e3276
[18585] Added bugfix note
livecodepanos May 7, 2018
fd57957
Use a switch block in commandkeydown for more clarity
livecodepanos May 9, 2018
4cae6ff
Merge pull request #1973 from livecode/bugfix-18585
livecodepanos May 12, 2018
a039f21
Merge pull request #1972 from livecode/bugfix-21222
livecodepanos May 22, 2018
185ab7a
Merge pull request #1965 from montegoulding/bugfix-21206
livecodepanos May 22, 2018
51cf182
Merge remote-tracking branch 'origin/develop-9.0' into merge-develop-…
livecodepanos May 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
546 changes: 273 additions & 273 deletions Documentation/guides/LiveCode Data Grid.md

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Toolset/libraries/revcommonlibrary.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ end revGoPDF
# should be ussed by people sending unicode characters, the original revMail can be used otherwise
command revMail pTo, pCC, pSubject, pBody
if the environment is "mobile" then
pass revMail
mobileComposeMail pSubject, pTo, pCC, , pBody
else
revMailUnicode pTo, pCC, uniEncode(pSubject), uniEncode(pBody)
end if
revMailUnicode pTo, pCC, uniEncode(pSubject), uniEncode(pBody)
end revMail

command revMailUnicode pTo, pCC, pSubject, pBody
Expand Down
31 changes: 27 additions & 4 deletions Toolset/libraries/revidelibrary.8.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -2249,6 +2249,15 @@ function revIDEStacksInUse
return tData
end revIDEStacksInUse

function revIDEStackIsIDEWindow pStackName
if pStackName begins with revIDEScriptEditorPrefix() or pStackName is "revDictionary" \
or pStackName is "revResourceCenter" or pStackName is "revOnline" then
return true
end if

return false
end revIDEStackIsIDEWindow

function revIDEAPIFilters
end revIDEAPIFilters

Expand Down Expand Up @@ -4927,11 +4936,21 @@ on revIDEGoToDictionaryEntry pLibrary, pTag, pType
revIDEMessageSend "ideOpenPalette", "dictionary"
end revIDEGoToDictionaryEntry

on revIDEGoToWidgetAPI pKind
command revIDEGoToExtensionAPI pKind
local tType
put revIDEExtensionProperty(pKind, "type") into tType
__GoToExtensionAPI pKind, tType
end revIDEGoToExtensionAPI

private command __GoToExtensionAPI pKind, pType
local tName, tLibrary
put revIDEExtensionProperty(pKind, "title") into tName
put tolower(pKind) into tLibrary
revIDEGoToDictionaryEntry tLibrary, tName, "widget"
revIDEGoToDictionaryEntry tLibrary, tName, pType
end __GoToExtensionAPI

command revIDEGoToWidgetAPI pKind
__GoToExtensionAPI pKind, "widget"
end revIDEGoToWidgetAPI

on revIDEGoToObjectAPI pObjectID
Expand Down Expand Up @@ -9816,7 +9835,7 @@ User stacks, script editors, the dictionary and resource center are considered w
from the point of view of the menubar
*/
function revIDEStackIsWindow pStackName
if pStackName begins with revIDEScriptEditorPrefix() or pStackName is "revDictionary" or pStackName is "revResourceCenter" then
if revIDEStackIsIDEWindow(pStackName) then
return true
end if

Expand Down Expand Up @@ -11514,7 +11533,11 @@ command ideExecuteScript pScript, pObject, pDebugMode, @rValidScript
end if

if tValidScript is empty then
return tOriginalCompileError for error
if tOriginalCompileError is not empty then
return tOriginalCompileError for error
else
put pScript into tValidScript
end if
end if
unlock screen

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,16 @@ end showUpgradeOptions

# bug 17819 enable cmd+c in dictionary
on commandKeyDown pWhich
if pWhich is not "C" then
if pWhich is "W" then
switch pWhich
case "A"
-- trap Cmd + A for select all
case "C"
-- trap Cmd + C for copy
break
case "W"
close me
else
break
default
pass commandKeyDown
end if
end if
end switch
end commandKeyDown
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ private function __MenuActionsForRow pDataA
put tLoadOnStartup after tActions
end if

put "Show Documentation" & return after tActions

local tSampleList
if pDataA["samples"] is not empty then
put "Sample Stacks" & return after tActions
Expand Down Expand Up @@ -281,6 +283,9 @@ on menuPick pAction
put the cSampleStacks of me into tSampleStacks
launchExtensionSampleStack tSampleStacks[tSample]
break
case "Show Documentation"
revIDEGoToExtensionAPI tKind
break
end switch
end menuPick

Expand Down
10 changes: 7 additions & 3 deletions Toolset/palettes/menubar/revmenubar.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private on setupWindowMenu
repeat for each line tStack in tWindows
if there is not a stack tStack then next repeat
put the short name of tStack into tStackName
if tStackName begins with "revNewScriptEditor" or tStackName is "revDictionary" or tStackName is "revResourceCenter" then
if revIDEStackIsIDEWindow(tStackName) then
put the title of tStack into tStackName
end if

Expand Down Expand Up @@ -1019,7 +1019,11 @@ on mouseUp
revIDETutorialSkipToNextSkipPoint
end if
else if the short name of the owner of the target is "upgrade" then
local tStartCenterClassic
put revIDEGetPreference("StartCenterClassic") into tStartCenterClassic
revIDESetPreference "StartCenterClassic", true
ideShowUpgradeOptions
revIDESetPreference "StartCenterClassic", tStartCenterClassic
else if the short name of the owner of the target is "toolbar" and the target begins with "button" then
revMenubarMenuButtonClicked the short name of the target
setButtonReleased the long id of the target
Expand Down Expand Up @@ -1382,7 +1386,7 @@ private function revMenubarFileMenu pContext
put "(Open Recent File" & return after tFile
end if

put enableMenuItem("&Close/W", the mode of the topStack <= 3) & return after tFile
put enableMenuItem("&Close/W", the mode of the topStack <= 3 and the short name of the topstack is not "revMenubar") & return after tFile
put enableMenuItem("Close and Remove From Memor&y", tCanSaveStack) & return after tFile
put "-" & return after tFile

Expand Down Expand Up @@ -2439,7 +2443,7 @@ function revListMenuHandlers pObject, pSort, pIndentationLevel
end revListMenuHandlers

on unIconifyStack
global gREVBackDropRestore
global gREVBackDropRestore, gREVRestore
set cursor to watch
lock messages
set the iconic of stack "revMenubar" to false
Expand Down
Binary file modified Toolset/palettes/revfileassociations.livecode
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ end textReplaceNewGroupNeeded
# This is the point through which all standard editing operations on scripts are sent through.
# Any change made via this function will be added to the undo system. This is called when the
# user types keys, formats text, cuts, pastes etc.
command textReplace pOffset, pOldText, pNewText, pObject, pDontGroup
command textReplace pOffset, pOldText, pNewText, pObject, pDontGroup, pDontSelect
lock screen

local tObject
Expand Down Expand Up @@ -943,27 +943,33 @@ command textReplace pOffset, pOldText, pNewText, pObject, pDontGroup
end repeat
put true into sPlaceholders[sEditPlaceholder]["edited"]

if tSelection is not empty then
select tSelection
else if pNewText is empty then
select char pOffset to pOffset-1 of field "script" of me
else if the length of pNewText is 1 then
select char pOffset+1 to pOffset of field "script" of me
else if tBracketCompletionType is "pair" then
select after char pOffset of field "script" of me
if not pDontSelect then
if tSelection is not empty then
select tSelection
else if pNewText is empty then
select char pOffset to pOffset-1 of field "script" of me
else if the length of pNewText is 1 then
select char pOffset+1 to pOffset of field "script" of me
else if tBracketCompletionType is "pair" then
select after char pOffset of field "script" of me
end if
end if
else
-- clear highlighted bracket background color
__ClearHighlights
textReplaceRaw pOffset, pOldText, pNewText
if tSelection is not empty then
select tSelection
else if tBracketCompletionType is "pair" then
select after char pOffset of field "script" of me
if not pDontSelect then
if tSelection is not empty then
select tSelection
else if tBracketCompletionType is "pair" then
select after char pOffset of field "script" of me
end if
end if
end if

selectionUpdateRequest
if not pDontSelect then
selectionUpdateRequest
end if

-- when formatting or pasting we don't want autocomplete to pop up
if the number of lines of pNewText <= 1 then
Expand Down Expand Up @@ -3455,6 +3461,10 @@ end __UpdateAutoCompleteList

private command __ClearCurrentPlaceholder pForce
if not pForce then
if the selectedField is empty or \
the long id of the selectedField is not the long id of field "script" of me then
exit __ClearCurrentPlaceholder
end if
local tChunk
put the selectedChunk into tChunk
if exists(tChunk) then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2203,7 +2203,7 @@ command replaceOnce pString
put tFrom into tAt

textBeginGroup "Replace"
textReplace tAt, char tFrom to tTo of textGetScript(), pString
textReplace tAt, char tFrom to tTo of textGetScript(), pString, , , true

# OK-2009-02-16 : Bug 7712 - Return information about the replaced text so that in a the context of replaceOnceAndFind, we can ensure
# that the replaced text does not get searched.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ command update
put getReplaceLabel() into tReplaceLabel

local tReplaceText
put getReplaceLabel() into tReplaceLabel
put historyGet("replace") into tReplaceText
if tReplaceLabel is not empty and tReplaceLabel is not among the lines of tReplaceText then
put tReplaceLabel & return & tReplaceText into tReplaceText
end if
Expand Down Expand Up @@ -119,7 +119,6 @@ command updateButtonStates
enable button "Find all" of me
enable button "Replace all" of me
enable button "Replace" of me
select item 1 of button "replace"
else
enable button "Find all" of me

Expand All @@ -130,7 +129,6 @@ command updateButtonStates
disable button "Find Next" of me
disable button "Replace one" of me
disable button "Replace" of me
set the label of button "replace" of me to empty
end if
end updateButtonStates

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2144,6 +2144,10 @@ command actionAutocompleteSnippetManager
modeless "com.livecode.palette.autocomplete-pro"
end actionAutocompleteSnippetManager

command actionLaunchMessageBox
revIDEOpenPalette "Message Box"
end actionLaunchMessageBox

################################################################################
#
# Keyboard shortcut handling
Expand Down
1 change: 1 addition & 0 deletions notes/bugfix-18585.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Ensure Dictionary does not pass cmd+A
1 change: 1 addition & 0 deletions notes/bugfix-20094.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Fix multi-line message box not executing if the first line is a comment
1 change: 1 addition & 0 deletions notes/bugfix-21167.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Ensure Replace history is remembered
1 change: 1 addition & 0 deletions notes/bugfix-21169.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Ensure splash screen always hides on Windows
1 change: 1 addition & 0 deletions notes/bugfix-21172.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Fix revMail on mobile
1 change: 1 addition & 0 deletions notes/bugfix-21174.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Ensure "Sample Stacks" window does show up in menu "Windows"
1 change: 1 addition & 0 deletions notes/bugfix-21176.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Make sure the Start Center can always show the Upgrade Options
1 change: 1 addition & 0 deletions notes/bugfix-21179.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add 'show documentation' option to contextual menu in extension manager
1 change: 1 addition & 0 deletions notes/bugfix-21202.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Fix deselection of next find after replace in Script Editor
1 change: 1 addition & 0 deletions notes/bugfix-21206.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Fix execution error opening message box from script editor via Cmd/Ctrl+M
1 change: 1 addition & 0 deletions notes/bugfix-21222.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Ensure File -> Close option is disabled when the topstack is stack revMenubar
22 changes: 20 additions & 2 deletions tests/messagebox/execution.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,28 @@ on TestReferenceControlOnActiveStack
create stack
set the defaultStack to the short name of it

local tToExecute
local tToExecute, tValidScript
put "put bar into field 1" into tToExecute
ideExecuteScript tToExecute, tStack, false, tValidScript

TestAssert "intelligence object command two params result", the text of tField is "bar"
TestAssert "intelligence object command two params executed", tValidScript is tToExecute
end TestReferenceControlOnActiveStack
end TestReferenceControlOnActiveStack

-- bug 20084
on TestMutilineWithCommentOnFirstLine
local tStack, tField
create stack
put it into tStack

set the defaultStack to the short name of tStack

create field
put it into tField

local tToExecute, tValidScript
put "-- foo" & return & "put bar into field 1" into tToExecute
ideExecuteScript tToExecute, tStack, false, tValidScript

TestAssert "multiline script with comment on first line executes", the text of tField is "bar"
end TestMutilineWithCommentOnFirstLine