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

Commit 5ed3a72

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'origin/develop-8.2' into merge-develop-8.2_03.11.17
2 parents a615a61 + e012a86 commit 5ed3a72

72 files changed

Lines changed: 591 additions & 405 deletions

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: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -637,22 +637,22 @@ component Runtime.iOS
637637
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
638638
file ios:iphonesimulator10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
639639
file ios:iphonesimulator10.2/fontmap as "fontmap"
640-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_0" place
641-
executable ios:iphonesimulator11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
642-
executable ios:iphonesimulator11.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
643-
executable ios:iphonesimulator11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
644-
executable ios:iphonesimulator11.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
645-
executable ios:iphonesimulator11.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
646-
executable ios:iphonesimulator11.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
647-
executable ios:iphonesimulator11.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
648-
executable ios:iphonesimulator11.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
649-
file ios:iphonesimulator11.0/mobile-template.plist as "Settings.plist"
650-
file ios:iphonesimulator11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
651-
file ios:iphonesimulator11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
652-
file ios:iphonesimulator11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
653-
file ios:iphonesimulator11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
654-
file ios:iphonesimulator11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
655-
file ios:iphonesimulator11.0/fontmap as "fontmap"
640+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_1" place
641+
executable ios:iphonesimulator11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
642+
executable ios:iphonesimulator11.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
643+
executable ios:iphonesimulator11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
644+
executable ios:iphonesimulator11.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
645+
executable ios:iphonesimulator11.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
646+
executable ios:iphonesimulator11.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
647+
executable ios:iphonesimulator11.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
648+
executable ios:iphonesimulator11.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
649+
file ios:iphonesimulator11.1/mobile-template.plist as "Settings.plist"
650+
file ios:iphonesimulator11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
651+
file ios:iphonesimulator11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
652+
file ios:iphonesimulator11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
653+
file ios:iphonesimulator11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
654+
file ios:iphonesimulator11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
655+
file ios:iphonesimulator11.1/fontmap as "fontmap"
656656
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
657657
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
658658
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -693,26 +693,26 @@ component Runtime.iOS
693693
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
694694
file ios:iphoneos10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
695695
file ios:iphoneos10.2/fontmap as "fontmap"
696-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_0" place
697-
executable ios:iphoneos11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
698-
executable ios:iphoneos11.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
699-
executable ios:iphoneos11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
700-
executable ios:iphoneos11.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
701-
executable ios:iphoneos11.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
702-
executable ios:iphoneos11.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
703-
executable ios:iphoneos11.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
704-
executable ios:iphoneos11.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
705-
file ios:iphoneos11.0/mobile-device-template.plist as "Settings.plist"
706-
file ios:iphoneos11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
707-
file ios:iphoneos11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
708-
file ios:iphoneos11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
709-
file ios:iphoneos11.0/template-entitlements.xcent as "Entitlements.xcent"
710-
file ios:iphoneos11.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
711-
file ios:iphoneos11.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
712-
file ios:iphoneos11.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
713-
file ios:iphoneos11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
714-
file ios:iphoneos11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
715-
file ios:iphoneos11.0/fontmap as "fontmap"
696+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_1" place
697+
executable ios:iphoneos11.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
698+
executable ios:iphoneos11.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
699+
executable ios:iphoneos11.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
700+
executable ios:iphoneos11.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
701+
executable ios:iphoneos11.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
702+
executable ios:iphoneos11.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
703+
executable ios:iphoneos11.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
704+
executable ios:iphoneos11.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
705+
file ios:iphoneos11.1/mobile-device-template.plist as "Settings.plist"
706+
file ios:iphoneos11.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
707+
file ios:iphoneos11.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
708+
file ios:iphoneos11.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
709+
file ios:iphoneos11.1/template-entitlements.xcent as "Entitlements.xcent"
710+
file ios:iphoneos11.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
711+
file ios:iphoneos11.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
712+
file ios:iphoneos11.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
713+
file ios:iphoneos11.1/mobile-disable-ats-template.plist as "DisableATS.plist"
714+
file ios:iphoneos11.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
715+
file ios:iphoneos11.1/fontmap as "fontmap"
716716

717717
////////////////////////////////////////////////////////////////////////////////
718718

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 9.2 10.2 11.0
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.0
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.1
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.1
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos11.0',
45+
'universal-ios-iphoneos11.1',
4646
'universal-ios-iphoneos10.2',
4747
'universal-ios-iphoneos9.2',
48-
'universal-ios-iphonesimulator11.0',
48+
'universal-ios-iphonesimulator11.1',
4949
'universal-ios-iphonesimulator10.2',
5050
'universal-ios-iphonesimulator9.2',
5151
'universal-ios-iphonesimulator8.2',

‎docs/dictionary/command/create-alias.lcdoc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: new alias
44

55
Type: command
66

7-
Syntax: create alias <aliasPath> to {file <originalFilePath> | folder <orginalFolderPath>}
7+
Syntax: create alias <aliasPath> to {file | folder} <originalPath>
88

99
Summary:
1010
Makes a new <alias>, <symbolic link>, or <shortcut> to the specified
@@ -33,11 +33,8 @@ The aliasPath specifies the name and location of the alias to be
3333
created. If you specify a name but not a location, the alias is created
3434
in the defaultFolder.
3535

36-
originalFilePath:
37-
38-
39-
orginalFolderPath:
40-
originalFilePath/originalFolderPath: The name and location of the
36+
originalPath:
37+
The name and location of the
4138
file/folder you want to make an alias to. If you specify a name but not
4239
a location, LiveCode assumes the file is in the defaultFolder.
4340

‎docs/dictionary/command/create-card.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ The <create card> <command> places the <ID> <property> of the newly
4242
created <card> in the <it> <variable>.
4343

4444
Description:
45-
Use the <create card> <command> to add a new <card> to the <current
46-
stack>.
45+
Use the <create card> <command> to add a new <card> to the
46+
<current stack>.
4747

4848
The new card is placed after the current card. If <stackName>
4949
is specified, it will be placed in <stackName>, otherwise

‎docs/dictionary/command/crop.lcdoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ If the <crop> rectangle is larger than the <image(object)|image's>
5555
original <rectangle>, blank <pixels> are added to one or more edges of
5656
the <image(keyword)>.
5757

58-
>*Important:* The <crop> <command> cannot be used on a <referenced
59-
> control|referenced image>. Doing so will cause an <execution error>.
58+
>*Important:* The <crop> <command> cannot be used on a
59+
> <referenced control|referenced image>. Doing so will cause an
60+
> <execution error>.
6061

6162
References: flip (command), rotate (command), property (glossary),
6263
referenced control (glossary), command (glossary),

‎docs/dictionary/command/delete-URL.lcdoc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ to delete, in the form of a URL.
3939
The result:
4040
If the file or directory is successfully deleted, the result <function>
4141
is set to empty. Otherwise, the <result> <function> returns an error
42-
message. >*Important:* If a <blocking> operation involving a <URL>
42+
message.
43+
>*Important:* If a <blocking> operation involving a <URL>
4344
(using the <put> <command> to <upload> a <URL>, the <post> <command>,
4445
the <delete URL> <command>, or a <statement> that gets an <ftp> or
4546
<http> <URL>) is going on, no other <blocking> <URL> operation can start
@@ -66,7 +67,7 @@ name and password is valid, you will almost always need a user name and
6667
password to use the <delete URL> <command>.
6768

6869
>*Note:* When used with an <ftp> or <http> <URL>, the <delete URL>
69-
> <command> is <blocking> : that is, the <handler> pauses until LiveCode
70+
> <command> is <blocking>: that is, the <handler> pauses until LiveCode
7071
> is finished deleting the <URL>. Since deleting a file from a server
7172
> may take some time due to network lag, the <delete URL> <command> may
7273
> take long enough to be noticeable to the user.
@@ -98,10 +99,10 @@ delete file (command), delete folder (command),
9899
function (control structure), result (function),
99100
LiveCode custom library (glossary), application (glossary),
100101
standalone application (glossary), statement (glossary),
101-
delete folder (glossary), blocking (glossary),
102+
blocking (glossary),
102103
Standalone Application Settings (glossary), command (glossary),
103104
expression (glossary), main stack (glossary), group (glossary),
104-
delete file (glossary), local file (glossary), server (glossary),
105+
local file (glossary), server (glossary),
105106
upload (glossary), folder (glossary), message (glossary),
106107
handler (glossary), binfile (keyword), ftp (keyword), file (keyword),
107108
URL (keyword), http (keyword), put (library), library (library),

‎docs/dictionary/command/mobileComposeUnicodeMail.lcdoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ from disk when the file is needed. Therefore, using
8181
large amounts of data to an e-mail. For example, sending multiple
8282
attachments may be done like this:
8383

84-
put "Hello World!" into tAttachments[1]["data"]
85-
put "text/plain" into tAttachments[1]["type"]
86-
put "Greetings.txt" into tAttachments[1]["name"]
87-
put "Goodbye World!" into tAttachments[2]["data"]
88-
put "text/plain" into tAttachments[2]["type"]
89-
put "Farewell.txt" into tAttachments[2]["name"]
90-
mobileComposeUnicodeMail tSubject, tTo, tCCs, tBCCs, tBody, tAttachments
84+
put "Hello World!" into tAttachments[1]["data"]
85+
put "text/plain" into tAttachments[1]["type"]
86+
put "Greetings.txt" into tAttachments[1]["name"]
87+
put "Goodbye World!" into tAttachments[2]["data"]
88+
put "text/plain" into tAttachments[2]["type"]
89+
put "Farewell.txt" into tAttachments[2]["name"]
90+
mobileComposeUnicodeMail tSubject, tTo, tCCs, tBCCs, tBody, tAttachments
9191

9292
Some devices are not configured with e-mail sending capability. To
9393
determine if the current device is, use the <mobileCanSendMail>

‎docs/dictionary/control_st/after.lcdoc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,10 @@ path. It gets to an object with a behavior script:
4040

4141
1. The engine looks at the behavior script of the target object - If a
4242
before mouseDown handler is present, it executes it.
43-
44-
4543
2. The engine next looks at the object script - If an on mouseDown
4644
handler is present, it executes it.
47-
48-
4945
3. The engine now looks at the behavior script - If an <after> mouseDown
5046
handler is present, it executes it.
51-
52-
5347
4. The engine finally looks at the object script - If a pass mouseDown
5448
or no mouseDown handler is present, it moves on to the parent object.
5549

‎docs/dictionary/control_st/before.lcdoc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,10 @@ path. It gets to an object with a behavior script:
4040

4141
1. The engine looks at the behavior script of the target object - If a
4242
<before> mouseDown handler is present, it executes it.
43-
44-
4543
2. The engine next looks at the object script - If an on mouseDown
4644
handler is present, it executes it.
47-
48-
4945
3. The engine now looks at the behavior script - If an after mouseDown
5046
handler is present, it executes it.
51-
52-
5347
4. The engine finally looks at the object script - If a pass mouseDown
5448
or no mouseDown handler is present, it moves on to the parent object.
5549

0 commit comments

Comments
 (0)