Skip to content

Commit 63bcbaf

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge_develop-9.0_28.03.2019
2 parents eea9e33 + f1287f0 commit 63bcbaf

File tree

137 files changed

+763
-336
lines changed

Some content is hidden

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

137 files changed

+763
-336
lines changed

‎Installer/package.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ component Runtime.Android
609609
file android-armeabi-v7a:livecode_inputcontrol.xml
610610
file android-armeabi-v7a:notify_icon.png
611611
file android-armeabi-v7a:nfc_tech_filter.xml
612+
file android-armeabi-v7a:file_provider_paths.xml
612613
with TargetFolder as [[ToolsFolder]]/Runtime/Android/armeabi-v7a do
613614
set TargetArchitecture to armeabi-v7a
614615
include Runtime.Android.Arch
@@ -965,12 +966,16 @@ component TimeZone
965966
rfolder ios:iphonesimulator10.2/packaged_extensions/com.livecode.library.timezone/code
966967
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
967968
rfolder ios:iphonesimulator11.2/packaged_extensions/com.livecode.library.timezone/code
969+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
970+
rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
968971
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
969972
rfolder ios:iphoneos9.2/packaged_extensions/com.livecode.library.timezone/code
970973
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
971974
rfolder ios:iphoneos10.2/packaged_extensions/com.livecode.library.timezone/code
972975
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
973976
rfolder ios:iphoneos11.2/packaged_extensions/com.livecode.library.timezone/code
977+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
978+
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
974979
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
975980
rfolder windows:packaged_extensions/com.livecode.library.timezone/code
976981
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place

‎docs/dictionary/command/click.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Any expression that evaluates to a point--a vertical and horizontal
4242
distance from the top left of the current stack, separated by a comma.
4343

4444
key:
45-
One of,,, or. You can specify up to three keys, separated by commas. (On
46-
Windows and Unix,indicates the Control key.)
45+
One of shiftKey, commandKey, optionKey, altKey or controlKey. You can
46+
specify up to three keys, separated by commas.
4747

4848
Description:
4949
Use the <click> <command> to simulate the action of a click, instead of

‎docs/dictionary/command/delete.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ungroup (command), delete file (command), deleteResource (function),
5252
clipboard (function), object (glossary), command (glossary),
5353
handler (glossary), execute (glossary), selection (keyword),
5454
card (keyword), image (keyword), control (keyword), deleteEPS (message),
55-
deletAudioclip (message), deleteButton (message), deletePlayer (message),
55+
deleteAudioclip (message), deleteButton (message), deletePlayer (message),
5656
deleteBackground (message), deleteImage (message), deleteCard (message),
5757
deleteGroup (message), deleteGraphic (message), deleteField (message),
5858
deleteVideoclip (message), stack (object), script (property),

‎docs/dictionary/command/disable-menu.lcdoc‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,19 @@ the Apple menu.
6060
Since a LiveCode menu bar is implemented as a group of buttons (one
6161
button per menu, with the menu items as lines in the button's text
6262
<property>), you can indicate a <menu> by specifying its <button>.
63-
<Disabled> <menu item|menu items> have an open parenthesis `(` before
64-
the name of that menu item, so when used to <disable> a <menu item>, the
65-
<disable menu> <command> adds an open parenthesis at the beginning of
63+
<disabled|Disabled> <menu item|menu items> have an open parenthesis `(`
64+
before the name of that menu item, so when used to <disable> a <menu item>,
65+
the <disable menu> <command> adds an open parenthesis at the beginning of
6666
the specified line.
6767

6868
Example of disabling a sub menu item using an open parenthesis:
6969

7070
Main1
71-
72-
Sub1
73-
(Sub2
74-
Sub3
75-
Main2
76-
Main3
71+
Sub1
72+
(Sub2
73+
Sub3
74+
Main2
75+
Main3
7776

7877

7978
The menu item "Sub2" will be disabled.

‎docs/dictionary/command/do-as-alternatelanguage.lcdoc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ The behavior of the <do as alternateLanguage> command is
3737

3838
- On MacOS and OS X systems, the <alternateLanguage> is a script
3939
language (such as AppleScript) supported by the Open Scripting
40-
Architecture. The value returned by executing the <statementList>
40+
Architecture. The value returned by executing the <script>
4141
is placed into the <result>.
4242

4343
- On Windows systems, the <alternateLanguage> is an "active
4444
scripting" language (such as VBScript) supported by the Windows
4545
Scripting Host. The <result> is set to the value of any global
46-
variable called `result` in the <statementList>, or empty if no such
46+
variable called `result` in the <script>, or empty if no such
4747
variable was defined. For example, the following code will show a
4848
dialog box containing "2":
4949

5050
do "result = 1 + 1" as "vbscript"
5151
answer the result
5252

53-
Any <statementList> which contains a reference to `WScript` will
53+
Any <script> which contains a reference to `WScript` will
5454
fail to run, because `WScript` objects do not exist in the LiveCode
5555
environment. Put return values in a global `result` variable
5656
instead of using `WScript.Echo`.
5757

5858
- In HTML5 applications, "JavaScript" is the only supported
5959
<alternateLanguage>. The <result> is set to the value returned
60-
by executing the <statementList>, as long as the value is a scalar
60+
by executing the <script>, as long as the value is a scalar
6161
(a string, number, boolean or undefined). Returning JavaScript
6262
arrays or objects is not supported.
6363

@@ -80,7 +80,6 @@ Changes:
8080
9.0.0
8181

8282
References: alternateLanguages (function), result (function),
83-
platform (function),
84-
command (glossary), file path (glossary),
83+
platform (function), command (glossary), file path (glossary),
8584
as (keyword),
86-
do (command)
85+
do (command)

‎docs/dictionary/command/enable-menu.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Since a LiveCode menu bar is implemented as a group of buttons (one
5757
button per menu, with the menu items as lines in the button's text
5858
<property>), you can indicate a <menu> by specifying its <button>.
5959
<Disabled> <menu item|menu items> have an open parenthesis ( at the
60-
beginning of the line for that menu item. When used to <enable> a <menu
61-
item>, the <enable menu> <command> removes the open parenthesis from the
60+
beginning of the line for that menu item. When used to <enable> a
61+
<menu item>, the <enable menu> <command> removes the open parenthesis from the
6262
beginning of the specified line.
6363

6464
References: enable (command), doMenu (command), menus (function),

‎docs/dictionary/command/unload-extension.lcdoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ extensionIdentifier:
2727
The identifier of the extension to unload.
2828

2929
Description:
30-
Use the <unload extension> <command> to unload a <LiveCode Builder
31-
extension>. The extension is removed from memory. If the extension is a
32-
library, its public handlers will no longer be in the message path. If
33-
it is a widget, it will no longer be available as a control to add to a
34-
stack.
30+
Use the <unload extension> <command> to unload a
31+
<LiveCode Builder extension>. The extension is removed from memory. If
32+
the extension is a library, its public handlers will no longer be in the
33+
message path. If it is a widget, it will no longer be available as a
34+
control to add to a stack.
3535

3636
If a module with the given identifier has already been loaded into
3737
memory, the result will be set to "module already loaded".

‎docs/dictionary/command/write-to-driver.lcdoc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ References: write to file (command), open driver (command),
4141
close driver (command), read from driver (command),
4242
write to process (command), write to socket (command),
4343
function (control structure), driverNames (function), result (function),
44-
command (glossary), peripheral device (glossary), real8 (keyword),
45-
int1 (keyword), int4 (keyword), real4 (keyword), int2 (keyword),
46-
LPT1: (keyword), printer: (keyword), modem: (keyword), COMn: (keyword)
44+
command (glossary), peripheral device (glossary), COMn: (keyword),
45+
real8 (keyword), int1 (keyword), int4 (keyword), real4 (keyword),
46+
int2 (keyword), LPT1: (keyword), printer: (keyword), modem: (keyword)
47+
4748

4849
Tags: networking
4950

‎docs/dictionary/command/write-to-process.lcdoc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ been opened previously with the open process command; otherwise, an
3030
error message is returned in the result.
3131

3232
The result:
33-
The process to write to must be opened first with the <open process
34-
command>, and the mode the <process> was opened in must be write or
33+
The process to write to must be opened first with the <open process>
34+
<command>, and the mode the <process> was opened in must be write or
3535
update. If the process is not running or is read-only, the <result>
3636
function is set to "Process is not open for write.". If there is an
3737
error writing to the process, the <result> function <return|returns> the
@@ -41,7 +41,6 @@ Description:
4141
Use the <write to process> <command> to send input to another program.
4242

4343
References: open process (command), read from process (command),
44-
write to driver (command), open process command (command),
45-
result (function), command (glossary), process (glossary),
46-
return (glossary), stdout (keyword)
44+
write to driver (command), result (function), command (glossary),
45+
process (glossary), return (glossary), stdout (keyword)
4746

‎docs/dictionary/function/URLDecode.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ another system.
3838
When the <URLDecode> function encounters a percent sign (%), it treats
3939
the next two characters as <hexadecimal> digits. (If one of the
4040
<characters> is not a <hexadecimal> digit, it's treated as a zero.) The
41-
number is converted to its <character> equivalent, using the <character
42-
set> currently in use.
41+
number is converted to its <character> equivalent, using the
42+
<character set> currently in use.
4343

4444
References: post (command), function (control structure),
4545
decompress (function), macToISO (function), arrayDecode (function),

0 commit comments

Comments
 (0)