Skip to content

Commit 2fe9c10

Browse files
livecodealilivecodeali
authored
Merge branch 'develop' into feature-server_test_runner
2 parents bec7442 + 37d7609 commit 2fe9c10

289 files changed

Lines changed: 5457 additions & 2788 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Installer/package.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ component Toolset
833833
stack ide-support:revsaveasiosstandalone.livecodescript
834834
stack ide-support:revsaveasstandalone.livecodescript
835835
stack ide-support:revsblibrary.livecodescript
836+
stack ide-support:revhtml5urllibrary.livecodescript
836837
file ide-support:revdocsparser.livecodescript
837838
file ide-support:revliburl.livecodescript
838839
file repo:extensions/script-libraries/dropbox/dropbox.livecodescript

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

33
constant kMergExtVersion = "2017-4-6"
4-
constant kTSNetVersion = "1.2.10"
4+
constant kTSNetVersion = "1.3.0"
55

66
local sEngineDir
77
local sWorkDir

‎docs/dictionary/command/answer-color.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Description:
4747
Use the <answer color> <command> to select a custom color.
4848

4949
The <answer color> <command> displays a <dialog box> where the user can
50-
select a color. (This dialog box is displayed by the operating system,
50+
select a color. (This <dialog box> is displayed by the operating system,
5151
not by LiveCode.)
5252

53-
If you specify a <startingColor>, the dialog box displays that color by
53+
If you specify a <startingColor>, the <dialog box> displays that color by
5454
default.
5555

5656
The color is returned in the form of three comma-separated integers

‎docs/dictionary/command/answer-effect.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ if the altKey is down then answer effect
2525
It:
2626
An encoded description of the visual effect the user chooses is placed
2727
in the it <variable>. You can either use the encoded description
28-
immediately, or store it (for example, in a <variable> or in a <custom
29-
property>) for later use. To display the effect, use the encoded
28+
immediately, or store it (for example, in a <variable> or in a
29+
<custom property>) for later use. To display the effect, use the encoded
3030
description with the <visual effect> <command>, with the <unlock screen>
3131
<command>, or with the hide with visual effect or show with visual
3232
effect form of the <hide> or <show> <command>. If the user cancels the
@@ -58,7 +58,7 @@ bit builds of LiveCode.
5858
References: answer (command), visual effect (command),
5959
answer record (command), show (command), hide (command),
6060
unlock screen (command), function (control structure), result (function),
61-
QTEffects (function), dialog box (glossary), custom property (glossary),
61+
qtEffects (function), dialog box (glossary), custom property (glossary),
6262
variable (glossary), command (glossary), QuickTime (glossary),
6363
return (glossary), dontUseQTEffects (property), dontUseQT (property)
6464

‎docs/dictionary/command/answer-file-with-type.lcdoc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Example:
2929
answer file (field "Prompt") with type "LiveCode Stacks|rev|RSTK"
3030

3131
Example:
32-
answer files "Select the images you wish to view:" with type "JPEG Images|jpg|JPEG" \
32+
answer files "Select the images you wish to view:" with type "JPEG Images|jpg|JPEG"
3333

3434
Parameters:
3535
prompt (string):
@@ -54,8 +54,8 @@ have a title bar.)
5454
It:
5555
The absolute file path of the file the user chose is placed in the it
5656
<variable>. If the answer files form is used, a return-delimited list of
57-
such paths is placed in the it variable. If the user cancels the <dialog
58-
box|dialog>, the <it> <variable> is set to empty.
57+
such paths is placed in the it variable. If the user cancels the
58+
<dialog box|dialog>, the <it> <variable> is set to empty.
5959

6060
The result:
6161
If <types> are specified, the result function will return the tag of the
@@ -65,11 +65,11 @@ Description:
6565
Use the <answer file> command when a <handler> needs the <file path> of
6666
a <file> before continuing.
6767

68-
The dialog box displayed is the same one most programs use for the
68+
The <dialog box> displayed is the same one most programs use for the
6969
"Open" command in the File menu.
7070

7171
>*Important:* The <answer file> <command> does not open the <file>. It
72-
> only displays the dialog box and retrieves the path to the file the
72+
> only displays the <dialog box> and retrieves the path to the file the
7373
> user specifies.
7474

7575
If more than one type is specified, a drop-down list containing the tags
@@ -78,15 +78,15 @@ display. (This list is always displayed on Windows systems).
7878

7979
If the as sheet form is used, the dialog box appears as a sheet on OS X
8080
systems. On other systems, the as sheet form has no effect and the
81-
dialog box appears normally. Attempting to open a sheet from within
81+
<dialog box> appears normally. Attempting to open a sheet from within
8282
another sheet displays the second stack as a <modal dialog box> instead.
83-
To give a dialog box a prompt when using the as sheet form a non-empty
83+
To give a <dialog box> a prompt when using the as sheet form a non-empty
8484
title must be provided. This will cause the prompt to appear in the same
8585
place it would if as sheet was not being used.
8686

8787
If the systemFileSelector <property> is set to false, LiveCode's
88-
built-in <dialog box> is used instead of the operating system's <file
89-
dialog box|standard file dialog>.
88+
built-in <dialog box> is used instead of the operating system's
89+
<file dialog box|standard file dialog>.
9090

9191
Changes:
9292
The answer file ... with type ... form was introduced in version 2.6.

‎docs/dictionary/command/answer-file.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ file dialog box.
4848
windowTitle:
4949
If specified, appears in the title bar of the dialog box.
5050
If no <windowTitle> is given, the title bar is blank. This parameter
51-
has no effect on Mac OS systems, because Mac OS file dialog boxes don't
52-
have a title bar.
51+
has no effect on macOS 10.11 (El Capitan) and above, so make sure that any important information is placed in the <prompt> parameter.
5352

5453
It:
5554
The <answer file> command places the absolute file path(s) of the

‎docs/dictionary/command/answer-folder.lcdoc‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: answer directory
44

55
Type: command
66

7-
Syntax: answer folder <prompt> [with <defaultPath>] [as sheet]
7+
Syntax: answer folder <prompt> [with <defaultPath>] [titled <windowTitle>] [as sheet]
88

99
Summary:
1010
Displays a <file dialog box|standard file dialog> for the user to choose
@@ -33,12 +33,17 @@ If you specify empty, no prompt appears.
3333

3434
defaultPath:
3535
The name and location of the folder whose contents are listed when the
36-
dialog box appears. If no defaultPath is specified, the dialog box lists
37-
the contents of the last folder you used with a file dialog box.
36+
<dialog box> appears. If no defaultPath is specified, the <dialog box> lists
37+
the contents of the last <folder> you used with a <file dialog box>.
38+
39+
windowTitle:
40+
If specified, appears in the title bar of the dialog box.
41+
If no <windowTitle> is given, the title bar is blank. This parameter
42+
has no effect on macOS 10.11 (El Capitan) and above, so make sure that any important information is placed in the <prompt> parameter.
3843

3944
It:
40-
The absolute file path of the folder the user selects is placed in the
41-
it <variable>.
45+
The absolute file path of the <folder> the user selects is placed in the
46+
<it> <variable>.
4247

4348
The result:
4449
If the user cancels the <dialog box|dialog>, the <it> <variable> is set
@@ -48,17 +53,17 @@ Description:
4853
Use the <answer folder> <command> when you want the user to choose a
4954
<folder> --for example, as a destination for <export|exported> <files>.
5055

51-
If the as sheet form is used, the dialog box appears as a sheet on OS X
56+
If the as sheet form is used, the <dialog box> appears as a sheet on OS X
5257
systems. On other systems, the as sheet form has no effect and the
53-
dialog box appears normally. Attempting to open a sheet from within
58+
<dialog box> appears normally. Attempting to open a sheet from within
5459
another sheet displays the second stack as a <modal dialog box> instead.
55-
To give a dialog box a prompt when using the as sheet form a non-empty
60+
To give a <dialog box> a prompt when using the as sheet form a non-empty
5661
title must be provided. This will cause the prompt to appear in the same
5762
place it would if as sheet was not being used.
5863

5964
If the systemFileSelector <property> is set to false, LiveCode's
60-
built-in <dialog box> is used instead of the operating system's <file
61-
dialog box|standard file dialog>.
65+
built-in <dialog box> is used instead of the operating system's
66+
<file dialog box|standard file dialog>.
6267

6368
Changes:
6469
The answer folder...as sheet form was introduced in version 2.0.

‎docs/dictionary/command/answer.lcdoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,5 @@ property (glossary), OS X (glossary), variable (glossary),
121121
message (glossary), modal dialog box (glossary), dialog box (glossary),
122122
command (glossary), gRevAppIcon (keyword), image (keyword),
123123
gRevProfileReadOnly (keyword), gRevSmallAppIcon (keyword),
124-
gRevSmallAppIcon keyword (keyword), gRevAppIcon keyword (keyword),
125124
HTMLText (property)
126125

‎docs/dictionary/command/ask-file-with-type.lcdoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ If <types> are specified, the result function will return the tag of the
5757
corresponding type selected from the supplied drop-down list.
5858

5959
Description:
60-
Use the ask file <command> to let the user provide the <file path|name
61-
and location> of a new <file>.
60+
Use the ask file <command> to let the user provide the
61+
<file path|name and location> of a new <file>.
6262

6363
The dialog box is the same one most applications use for the "Save"
6464
command in the File menu. (If the systemFileSelector <property> is set
6565
to true on <Mac OS> and <Windows|Windows systems>, and always on
66-
<Unix|Unix systems>, the <application> displays its own built-in <dialog
67-
box>, instead of the one provided by the operating system.)
66+
<Unix|Unix systems>, the <application> displays its own built-in
67+
<dialog box>, instead of the one provided by the operating system.)
6868

6969
>*Important:* The ask file command does not create the file. It only
7070
> displays the dialog box and retrieves the path to the file the user
@@ -84,8 +84,8 @@ appears normally. Attempting to open a sheet from within another sheet
8484
displays the second stack as a <modal dialog box> instead.
8585

8686
If the systemFileSelector <property> is set to false, LiveCode's
87-
built-in <dialog box> is used instead of the operating system's <file
88-
dialog box|standard file dialog>.
87+
built-in <dialog box> is used instead of the operating system's
88+
<file dialog box|standard file dialog>.
8989

9090
Changes:
9191
The ask file ... with type ... form was introduced in version 2.6.

‎docs/dictionary/command/ask-file.lcdoc‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,19 @@ suggested file name is provided in the defaultFilePath, it appears in
4242
the file name box.
4343

4444
types:
45-
The types parameter specifies which extensions are available at the
45+
The types parameter specifies which extensions are available at the
4646
bottom of the dialog box. A file type consists of an optional
4747
description, a line feed or comma, and a file extension specification:
48-
[description],*.extension You can include more than one file type by
49-
separating the file types with commas.>*Cross-platform note:* The types
50-
parameter applies only to Windows systems. On Mac OS and Unix systems,
51-
this parameter has no effect.
48+
49+
[description],*.extension
50+
51+
You can include more than one file type by separating the file types
52+
with commas.
53+
54+
>*Cross-platform note:* The <types> <parameter> applies only to
55+
> <Windows|Windows systems>. On <Mac OS> and <Unix|Unix systems>, this
56+
> <parameter> has no effect.
57+
5258

5359
It:
5460
The absolute file path of the file the user chose is placed in the it
@@ -59,18 +65,14 @@ If the user cancels the <dialog box|dialog>, the <it> <variable> is set
5965
to empty, and the <result> <function> <return|returns> cancel.
6066

6167
Description:
62-
Use the <ask file> <command> to let the user provide the <file path|name
63-
and location> of a new <file>.
64-
65-
>*Cross-platform note:* The <types> <parameter> applies only to
66-
> <Windows|Windows systems>. On <Mac OS> and <Unix|Unix systems>, this
67-
> <parameter> has no effect.
68+
Use the <ask file> <command> to let the user provide the
69+
<file path|name and location> of a new <file>.
6870

6971
The dialog box is the same one most applications use for the "Save"
7072
command in the File menu. (If the systemFileSelector <property> is set
7173
to true on <Mac OS> and <Windows|Windows systems>, and always on
72-
<Unix|Unix systems>, the <application> displays its own built-in <dialog
73-
box>, instead of the one provided by the operating system.)
74+
<Unix|Unix systems>, the <application> displays its own built-in
75+
<dialog box>, instead of the one provided by the operating system.)
7476

7577
>*Important:* The ask file command does not create the file. It only
7678
> displays the dialog box and retrieves the path to the file the user
@@ -87,8 +89,8 @@ dialog box appears normally. Attempting to open a sheet from within
8789
another sheet displays the second stack as a <modal dialog box> instead.
8890

8991
If the systemFileSelector <property> is set to false, LiveCode's
90-
built-in <dialog box> is used instead of the operating system's <file
91-
dialog box|standard file dialog>.
92+
built-in <dialog box> is used instead of the operating system's
93+
<file dialog box|standard file dialog>.
9294

9395
>*Cross-platform note:* On <Mac OS|Mac OS systems> where Navigation
9496
> Services is in use, if you don't specify a default file name, the file

0 commit comments

Comments
 (0)