Merge remote-tracking branch 'origin/merge-develop-8.1-07.03.2018' into merge-develop-8.2-07.03.2018

livecodepanos · livecodepanos · commit 3131e749de9b · 2018-03-07T18:42:46.000Z
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,6 +1,6 @@
 ﻿script "BuilderUtilities"
 
-constant kMergExtVersion = "2017-12-14"
+constant kMergExtVersion = "2018-3-2"
 constant kTSNetVersion = "1.3.4"
 
 local sEngineDir
diff --git a/docs/notes/bugfix-20986.md b/docs/notes/bugfix-20986.md
@@ -0,0 +1 @@
+# Ensure mobileSoundOnChannel() returns correct value on iOS
diff --git a/docs/notes/bugfix-21016.md b/docs/notes/bugfix-21016.md
@@ -0,0 +1 @@
+# Add support for local storage to Android browser
diff --git a/engine/src/java/com/runrev/android/libraries/LibBrowser.java b/engine/src/java/com/runrev/android/libraries/LibBrowser.java
@@ -325,6 +325,7 @@ public void onHideCustomView()
 		
 		setWebChromeClient(m_chrome_client);
 		getSettings().setJavaScriptEnabled(true);
+		getSettings().setDomStorageEnabled(true);
 		getSettings().setPluginState(WebSettings.PluginState.ON);
 		getSettings().setBuiltInZoomControls(true);
 		addJavascriptInterface(new JSInterface(), "liveCode");
diff --git a/engine/src/java/com/runrev/android/nativecontrol/BrowserControl.java b/engine/src/java/com/runrev/android/nativecontrol/BrowserControl.java
@@ -290,6 +290,7 @@ public void onHideCustomView()
 		};
 		t_view.setWebChromeClient(m_chrome_client);
         t_view.getSettings().setJavaScriptEnabled(true);
+		t_view.getSettings().setDomStorageEnabled(true);
         t_view.getSettings().setPluginState(WebSettings.PluginState.ON);
         t_view.getSettings().setBuiltInZoomControls(true);
         t_view.addJavascriptInterface(new JSInterface(), "revjs");
diff --git a/engine/src/mbliphonesound.mm b/engine/src/mbliphonesound.mm
@@ -680,22 +680,22 @@ bool MCSystemSoundChannelStatus(MCStringRef p_channel, intenum_t& r_status)
 
 bool MCSystemSoundOnChannel(MCStringRef p_channel, MCStringRef& r_sound)
 {
-/*	MCSystemSoundChannel *t_channel;
+	MCSystemSoundChannel *t_channel;
 	if (!find_sound_channel(p_channel, false, t_channel))
 		return false;
 	
-	return MCCStringClone(t_channel -> current_player . sound, r_sound);*/
-    return false;
+	MCValueAssign(r_sound, t_channel -> current_player . sound);
+	return true;
 }
 
 bool MCSystemNextSoundOnChannel(MCStringRef p_channel, MCStringRef& r_sound)
 {
-/*	MCSystemSoundChannel *t_channel;
+	MCSystemSoundChannel *t_channel;
 	if (!find_sound_channel(p_channel, false, t_channel))
 		return false;
 	
-    return MCCStringClone(t_channel -> next_player . sound, r_sound);*/
-    return false;
+	MCValueAssign(r_sound, t_channel -> next_player . sound);
+	return true;
 }
 
 // MM-2012-02-11: Refactored to return a formatted sting of channels
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -1410,6 +1410,10 @@ IO_stat MCDispatch::startup(void)
     if (t_info . stack -> getextendedstate(ECS_USES_PARENTSCRIPTS))
         t_info . stack -> resolveparentscripts();
 
+    // Resolve parent scripts
+    if (t_info . stack -> getextendedstate(ECS_USES_PARENTSCRIPTS))
+        t_info . stack -> resolveparentscripts();
+    
 	MCscreen->resetcursors();
 	MCtemplateimage->init();
 	send_startup_message();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure mobileSoundOnChannel() returns correct value on iOS`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Add support for local storage to Android browser`
Original file line number	Diff line number	Diff line change
`@@ -680,22 +680,22 @@ bool MCSystemSoundChannelStatus(MCStringRef p_channel, intenum_t& r_status)`
`680`	`680`
`681`	`681`	`bool MCSystemSoundOnChannel(MCStringRef p_channel, MCStringRef& r_sound)`
`682`	`682`	`{`
`683`		`-/* MCSystemSoundChannel *t_channel;`
	`683`	`+ MCSystemSoundChannel *t_channel;`
`684`	`684`	`if (!find_sound_channel(p_channel, false, t_channel))`
`685`	`685`	`return false;`
`686`	`686`
`687`		`- return MCCStringClone(t_channel -> current_player . sound, r_sound);*/`
`688`		`- return false;`
	`687`	`+ MCValueAssign(r_sound, t_channel -> current_player . sound);`
	`688`	`+ return true;`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`bool MCSystemNextSoundOnChannel(MCStringRef p_channel, MCStringRef& r_sound)`
`692`	`692`	`{`
`693`		`-/* MCSystemSoundChannel *t_channel;`
	`693`	`+ MCSystemSoundChannel *t_channel;`
`694`	`694`	`if (!find_sound_channel(p_channel, false, t_channel))`
`695`	`695`	`return false;`
`696`	`696`
`697`		`- return MCCStringClone(t_channel -> next_player . sound, r_sound);*/`
`698`		`- return false;`
	`697`	`+ MCValueAssign(r_sound, t_channel -> next_player . sound);`
	`698`	`+ return true;`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`// MM-2012-02-11: Refactored to return a formatted sting of channels`