Merge pull request #1977 from livecode/merge-develop-9.0-22.05.2018

livecodepanos · web-flow · commit 06edb2d37460 · 2018-05-23T14:36:29.000+01:00
Merge develop 9.0 22.05.2018
diff --git a/Documentation/guides/LiveCode Data Grid.md b/Documentation/guides/LiveCode Data Grid.md
diff --git a/Toolset/libraries/revcommonlibrary.livecodescript b/Toolset/libraries/revcommonlibrary.livecodescript
@@ -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
diff --git a/Toolset/libraries/revidelibrary.8.livecodescript b/Toolset/libraries/revidelibrary.8.livecodescript
@@ -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
 
@@ -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
@@ -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
    
@@ -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
    
diff --git a/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript b/Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript
@@ -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
diff --git a/Toolset/palettes/extension manager/revideextensionmanagerrowbehavior.livecodescript b/Toolset/palettes/extension manager/revideextensionmanagerrowbehavior.livecodescript
@@ -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
@@ -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
 
diff --git a/Toolset/palettes/menubar/revmenubar.livecodescript b/Toolset/palettes/menubar/revmenubar.livecodescript
@@ -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
       
@@ -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
@@ -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
    
@@ -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
diff --git a/Toolset/palettes/revfileassociations.livecode b/Toolset/palettes/revfileassociations.livecode
diff --git a/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript
@@ -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
@@ -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
@@ -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
diff --git a/Toolset/palettes/script editor/behaviors/revseeditorbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revseeditorbehavior.livecodescript
@@ -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.
diff --git a/Toolset/palettes/script editor/behaviors/revsefindmaincardbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revsefindmaincardbehavior.livecodescript
@@ -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
@@ -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
       
@@ -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
 
diff --git a/Toolset/palettes/script editor/behaviors/revsestackbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revsestackbehavior.livecodescript
@@ -2144,6 +2144,10 @@ command actionAutocompleteSnippetManager
    modeless "com.livecode.palette.autocomplete-pro"
 end actionAutocompleteSnippetManager
 
+command actionLaunchMessageBox
+   revIDEOpenPalette "Message Box"
+end actionLaunchMessageBox
+
 ################################################################################
 #
 # Keyboard shortcut handling
diff --git a/notes/bugfix-18585.md b/notes/bugfix-18585.md
@@ -0,0 +1 @@
+# Ensure Dictionary does not pass cmd+A
diff --git a/notes/bugfix-20094.md b/notes/bugfix-20094.md
@@ -0,0 +1 @@
+# Fix multi-line message box not executing if the first line is a comment
diff --git a/notes/bugfix-21167.md b/notes/bugfix-21167.md
@@ -0,0 +1 @@
+# Ensure Replace history is remembered
diff --git a/notes/bugfix-21169.md b/notes/bugfix-21169.md
@@ -0,0 +1 @@
+# Ensure splash screen always hides on Windows
diff --git a/notes/bugfix-21172.md b/notes/bugfix-21172.md
@@ -0,0 +1 @@
+# Fix revMail on mobile
diff --git a/notes/bugfix-21174.md b/notes/bugfix-21174.md
@@ -0,0 +1 @@
+# Ensure "Sample Stacks" window does show up in menu "Windows"
diff --git a/notes/bugfix-21176.md b/notes/bugfix-21176.md
@@ -0,0 +1 @@
+# Make sure the Start Center can always show the Upgrade Options
diff --git a/notes/bugfix-21179.md b/notes/bugfix-21179.md
@@ -0,0 +1 @@
+# Add 'show documentation' option to contextual menu in extension manager
diff --git a/notes/bugfix-21202.md b/notes/bugfix-21202.md
@@ -0,0 +1 @@
+# Fix deselection of next find after replace in Script Editor
diff --git a/notes/bugfix-21206.md b/notes/bugfix-21206.md
@@ -0,0 +1 @@
+# Fix execution error opening message box from script editor via Cmd/Ctrl+M
diff --git a/notes/bugfix-21222.md b/notes/bugfix-21222.md
@@ -0,0 +1 @@
+# Ensure File -> Close option is disabled when the topstack is stack revMenubar
diff --git a/tests/messagebox/execution.livecodescript b/tests/messagebox/execution.livecodescript
@@ -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
