Added support for the action to open an URL in GDJS (with support for…

… CocoonJS & Intel XDK)
4ian · Oct 14, 2014 · c648380 · c648380
1 parent 9f15f25
commit c648380
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/Core/GDCore/BuiltinExtensions/FileExtension.cpp b/Core/GDCore/BuiltinExtensions/FileExtension.cpp
@@ -127,13 +127,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
         .MarkAsAdvanced();
 
     extension.AddAction("LaunchFile",
-                   _("Launch a file"),
-                   _("This action launch the specified file."),
-                   _("Launch the file _PARAM0_"),
+                   _("Open an URL or a file"),
+                   _("This action launch the specified file or URL, in a browser (or in a new tab if the game is using the Web platform and is launched inside a browser)."),
+                   _("Open URL (or file) _PARAM0_"),
                    _("Files"),
                    "res/actions/launchFile24.png",
                    "res/actions/launchFile.png")
-        .AddParameter("file", _("Filename"), "",false)
+        .AddParameter("string", _("URL (or filename)"), "",false)
         .MarkAsAdvanced();
 
     extension.AddAction("ExecuteCmd",

diff --git a/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp b/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp
@@ -41,6 +41,8 @@ FileExtension::FileExtension()
         .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.deleteElementFromJSONFile");
     GetAllActions()["DeleteFichier"].SetGroup(_("Storage"))
         .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.clearJSONFile");
+    GetAllActions()["LaunchFile"]
+        .codeExtraInformation.SetFunctionName("gdjs.evtTools.window.openURL");
 
     StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here:
     /*
@@ -54,16 +56,6 @@ FileExtension::FileExtension()
         .AddParameter("file", _("Filename"), "",false)
         .codeExtraInformation.SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h");
 
-    AddAction("LaunchFile",
-                   _("Launch a file"),
-                   _("This action launch the specified file."),
-                   _("Launch the file _PARAM0_"),
-                   _("Files"),
-                   "res/actions/launchFile24.png",
-                   "res/actions/launchFile.png")
-        .AddParameter("file", _("Filename"), "",false)
-        .codeExtraInformation.SetFunctionName("LaunchFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h");
-
     AddAction("ExecuteCmd",
                    _("Execute a command"),
                    _("This action execute the specified command."),

diff --git a/GDJS/GDJS/Exporter.cpp b/GDJS/GDJS/Exporter.cpp
@@ -540,6 +540,12 @@ bool Exporter::ExportWholeProject(gd::Project & project, std::string exportDir,
         fs.MkDir(exportDir+"/Extensions");
         std::vector<std::string> includesFiles;
 
+        if (exportForCocoonJS)
+        {
+            fs.MkDir(exportDir+"/libs/CocoonJS");
+            includesFiles.push_back("libs/CocoonJS/cocoon.min.js");
+        }
+
         gd::Project exportedProject = project;
 
         //Export the resources ( before generating events as some resources filenames may be updated )

diff --git a/GDJS/Runtime/libs/CocoonJS/cocoon.min.js b/GDJS/Runtime/libs/CocoonJS/cocoon.min.js
diff --git a/GDJS/Runtime/windowtools.js b/GDJS/Runtime/windowtools.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * Tools related to runtime scene, for events generated code.
+ * Tools related to window, for events generated code.
  * @namespace gdjs.evtTools
  * @class window
  * @static
@@ -44,3 +44,15 @@ gdjs.evtTools.window.getWindowWidth = function() {
 gdjs.evtTools.window.getWindowHeight = function() {
     return window.innerHeight;
 };
+
+gdjs.evtTools.window.openURL = function(url) {
+    //Try to detect the environment to use the most adapted
+    //way of opening an URL.
+    if (typeof intel !== "undefined" && intel.xdk && intel.xdk.device && intel.xdk.device.launchExternal) {
+        intel.xdk.device.launchExternal(url);
+    } else if (typeof Cocoon !== "undefined" && Cocoon.App && Cocoon.App.openURL ) {
+        Cocoon.App.openURL(url);
+    } else {
+        window.open(url);
+    }
+}