merge js upds 1

applications/system/js_app/examples/apps/Scripts/js_examples/gui.js

@@ -8,6 +8,7 @@ let textInputView = require("gui/text_input");
 let byteInputView = require("gui/byte_input");
 let textBoxView = require("gui/text_box");
 let dialogView = require("gui/dialog");
+let flipper = require("flipper");
 
 // declare view instances
 let views = {
@@ -15,16 +16,18 @@ let views = {
     empty: emptyView.make(),
     keyboard: textInputView.makeWith({
         header: "Enter your name",
+        defaultText: flipper.getName(),
+        defaultTextClear: true,
+        // Props for makeWith() are passed in reverse order, so maxLength must be after defaultText
         minLength: 0,
         maxLength: 32,
     }),
-    helloDialog: dialogView.makeWith({
-        center: "Hi Flipper! :)",
-    }),
+    helloDialog: dialogView.make(),
     bytekb: byteInputView.makeWith({
         header: "Look ma, I'm a header text!",
-        length: 8,
         defaultData: Uint8Array([0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88]),
+        // Props for makeWith() are passed in reverse order, so length must be after defaultData
+        length: 8,
     }),
     longText: textBoxView.makeWith({
         text: "This is a very long string that demonstrates the TextBox view. Use the D-Pad to scroll backwards and forwards.\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse rhoncus est malesuada quam egestas ultrices. Maecenas non eros a nulla eleifend vulputate et ut risus. Quisque in mauris mattis, venenatis risus eget, aliquam diam. Fusce pretium feugiat mauris, ut faucibus ex volutpat in. Phasellus volutpat ex sed gravida consectetur. Aliquam sed lectus feugiat, tristique lectus et, bibendum lacus. Ut sit amet augue eu sapien elementum aliquam quis vitae tortor. Vestibulum quis commodo odio. In elementum fermentum massa, eu pellentesque nibh cursus at. Integer eleifend lacus nec purus elementum sodales. Nulla elementum neque urna, non vulputate massa semper sed. Fusce ut nisi vitae dui blandit congue pretium vitae turpis.",
@@ -67,6 +70,7 @@ eventLoop.subscribe(views.demos.chosen, function (_sub, index, gui, eventLoop, v
 // say hi after keyboard input
 eventLoop.subscribe(views.keyboard.input, function (_sub, name, gui, views) {
     views.helloDialog.set("text", "Hi " + name + "! :)");
+    views.helloDialog.set("center", "Hi Flipper! :)");
     gui.viewDispatcher.switchTo(views.helloDialog);
 }, gui, views);
 
@@ -83,14 +87,19 @@ eventLoop.subscribe(views.bytekb.input, function (_sub, data, gui, views) {
     for (let i = 0; i < data_view.length; i++) {
         text += toString(data_view[i], 16);
     }
-    views.helloDialog.set("text", "You typed " + text + "! :)");
+    views.helloDialog.set("text", "You typed:\n" + text);
+    views.helloDialog.set("center", "Cool!");
     gui.viewDispatcher.switchTo(views.helloDialog);
 }, gui, views);
 
 // go to the demo chooser screen when the back key is pressed
-eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, gui, views) {
+eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, gui, views, eventLoop) {
+    if (gui.viewDispatcher.currentView === views.demos) {
+        eventLoop.stop();
+        return;
+    }
     gui.viewDispatcher.switchTo(views.demos);
-}, gui, views);
+}, gui, views, eventLoop);
 
 // run UI
 gui.viewDispatcher.switchTo(views.demos);

applications/system/js_app/examples/apps/Scripts/js_examples/interactive.js

@@ -0,0 +1,77 @@
+let eventLoop = require("event_loop");
+let gui = require("gui");
+let dialog = require("gui/dialog");
+let textInput = require("gui/text_input");
+let loading = require("gui/loading");
+let storage = require("storage");
+
+// No eval() or exec() so need to run code from file, and filename must be unique
+storage.makeDirectory("/ext/.tmp");
+storage.makeDirectory("/ext/.tmp/js");
+storage.rmrf("/ext/.tmp/js/repl")
+storage.makeDirectory("/ext/.tmp/js/repl")
+let ctx = {
+    tmp_template: "/ext/.tmp/js/repl/",
+    tmp_number: 0,
+};
+
+let views = {
+    dialog: dialog.makeWith({
+        header: "Interactive Console",
+        text: "Press OK to Start",
+        center: "Run Some JS"
+    }),
+    textInput: textInput.makeWith({
+        header: "Type JavaScript Code:",
+        defaultText: "2+2",
+        defaultTextClear: true,
+        // Props for makeWith() are passed in reverse order, so maxLength must be after defaultText
+        minLength: 0,
+        maxLength: 256,
+    }),
+    loading: loading.make(),
+};
+
+eventLoop.subscribe(views.dialog.input, function (_sub, button, gui, views) {
+    if (button === "center") {
+        gui.viewDispatcher.switchTo(views.textInput);
+    }
+}, gui, views);
+
+eventLoop.subscribe(views.textInput.input, function (_sub, text, gui, views, ctx) {
+    gui.viewDispatcher.switchTo(views.loading);
+
+    let path = ctx.tmp_template + toString(ctx.tmp_number++);
+    let file = storage.openFile(path, "w", "create_always");
+    file.write("({run:function(){return " + text + ";},})");
+    file.close();
+
+    // Hide GUI before running, we want to see console and avoid deadlock if code fails
+    gui.viewDispatcher.sendTo("back");
+    let result = load(path).run();
+    storage.remove(path);
+    gui.viewDispatcher.sendTo("front");
+
+    // Must convert to string explicitly
+    if (typeof result === "number") {
+        result = toString(result);
+    } else if (typeof result === "undefined") {
+        result = "undefined";
+    } else if (typeof result === "boolean") {
+        result = result ? "true" : "false";
+    } else if (typeof result === "object") {
+        result = JSON.stringify(result);
+    }
+
+    views.dialog.set("header", "JS Returned:");
+    views.dialog.set("text", result);
+    gui.viewDispatcher.switchTo(views.dialog);
+    views.textInput.set("defaultText", text);
+}, gui, views, ctx);
+
+eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, eventLoop) {
+    eventLoop.stop();
+}, eventLoop);
+
+gui.viewDispatcher.switchTo(views.dialog);
+eventLoop.run();

applications/system/js_app/examples/apps/Scripts/js_examples/load.js

@@ -1,3 +1,3 @@
-let math = load("/ext/apps/Scripts/load_api.js");
+let math = load(__dirpath + "/load_api.js");
 let result = math.add(5, 10);
 print(result);