From d8bd108a5d3fea4a2bbcf0591d1b0f0623c06902 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Mon, 18 Apr 2016 13:21:33 -0700
Subject: [PATCH] Bug 944164 - Further jorendb fixes, r=me

MozReview-Commit-ID: FmU2mqudGY7

--HG--
extra : rebase_source : 57ab7f70d26d25d59fdad37eedd7d425f22e5eda
extra : histedit_source : 7e83c2d3eab96ffdb675ea5843daa24580826950
---
 js/examples/jorendb.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/js/examples/jorendb.js b/js/examples/jorendb.js
index 7fb9bd3f44f5..06965ccef784 100644
--- a/js/examples/jorendb.js
+++ b/js/examples/jorendb.js
@@ -230,16 +230,10 @@ function runCommand(args) {
         activeTask.scriptArgs = parseArgs(args);
     rerun = true;
     for (var f = topFrame; f; f = f.older) {
-        print(f.script.url + ":" + f.script.getOffsetLine(f.offset) +" was " + f.onPop);
         if (f.older) {
-            f.onPop = function() {
-                print("Resumifying " + this.script.url + ":" + this.script.getOffsetLine(this.offset));
-                return null;
-            };
+            f.onPop = () => null;
         } else {
-            f.onPop = function() {
-                return { 'return': 0 };
-            };
+            f.onPop = () => ({ 'return': 0 });
         }
     }
     //return describedRv([{ 'return': 0 }], "runCommand");
@@ -849,11 +843,12 @@ while(args.length > 0) {
     } else {
         if (!scriptSeen) {
             print("  load general");
-            scriptSeen = true;
+            actualScriptArgs.push(...args);
             todo.push({
                 'action': 'load',
                 'script': arg,
             });
+            break;
         } else {
             print("  arg " + arg);
             actualScriptArgs.push(arg);