iphone x fixes

5 files changed, 76 insertions, 157 deletions

diff --git a/StoneIsland/platforms/ios/cordova/node_modules/nopt/package.json b/StoneIsland/platforms/ios/cordova/node_modules/nopt/package.json
index 6d6a39a7..3784dfb3 100755
--- a/StoneIsland/platforms/ios/cordova/node_modules/nopt/package.json
+++ b/StoneIsland/platforms/ios/cordova/node_modules/nopt/package.json
@@ -1,47 +1,27 @@
 {
-  "_args": [
-    [
-      {
-        "raw": "nopt@^3.0.6",
-        "scope": null,
-        "escapedName": "nopt",
-        "name": "nopt",
-        "rawSpec": "^3.0.6",
-        "spec": ">=3.0.6 <4.0.0",
-        "type": "range"
-      },
-      "/Users/shazron/Documents/git/apache/cordova-ios"
-    ]
-  ],
-  "_from": "nopt@>=3.0.6 <4.0.0",
+  "_from": "nopt@^3.0.6",
   "_id": "nopt@3.0.6",
   "_inBundle": true,
-  "_inCache": true,
+  "_integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
   "_location": "/cordova-ios/nopt",
-  "_nodeVersion": "4.2.1",
-  "_npmUser": {
-    "name": "othiym23",
-    "email": "ogd@aoaioxxysz.net"
-  },
-  "_npmVersion": "2.14.10",
   "_phantomChildren": {},
   "_requested": {
+    "type": "range",
+    "registry": true,
     "raw": "nopt@^3.0.6",
-    "scope": null,
-    "escapedName": "nopt",
     "name": "nopt",
+    "escapedName": "nopt",
     "rawSpec": "^3.0.6",
-    "spec": ">=3.0.6 <4.0.0",
-    "type": "range"
+    "saveSpec": null,
+    "fetchSpec": "^3.0.6"
   },
   "_requiredBy": [
     "/cordova-ios"
   ],
   "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
   "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9",
-  "_shrinkwrap": null,
   "_spec": "nopt@^3.0.6",
-  "_where": "/Users/shazron/Documents/git/apache/cordova-ios",
+  "_where": "/Users/spindori/Documents/Cordova/cordova-ios",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -53,38 +33,19 @@
   "bugs": {
     "url": "https://github.com/npm/nopt/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {
     "abbrev": "1"
   },
+  "deprecated": false,
   "description": "Option parsing for Node, supporting types, shorthands, etc. Used by npm.",
   "devDependencies": {
     "tap": "^1.2.0"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9",
-    "tarball": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-  },
-  "gitHead": "10a750c9bb99c1950160353459e733ac2aa18cb6",
   "homepage": "https://github.com/npm/nopt#readme",
   "license": "ISC",
   "main": "lib/nopt.js",
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "zkat",
-      "email": "kat@sykosomatic.org"
-    }
-  ],
   "name": "nopt",
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/nopt.git"
diff --git a/StoneIsland/platforms/ios/cordova/node_modules/q/LICENSE b/StoneIsland/platforms/ios/cordova/node_modules/q/LICENSE
index 8a706b59..9ce1ea59 100755
--- a/StoneIsland/platforms/ios/cordova/node_modules/q/LICENSE
+++ b/StoneIsland/platforms/ios/cordova/node_modules/q/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009–2014 Kristopher Michael Kowal. All rights reserved.
+Copyright 2009–2017 Kristopher Michael Kowal. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 deal in the Software without restriction, including without limitation the
diff --git a/StoneIsland/platforms/ios/cordova/node_modules/q/package.json b/StoneIsland/platforms/ios/cordova/node_modules/q/package.json
index 49ad3b60..30e1b1b8 100755
--- a/StoneIsland/platforms/ios/cordova/node_modules/q/package.json
+++ b/StoneIsland/platforms/ios/cordova/node_modules/q/package.json
@@ -1,48 +1,28 @@
 {
-  "_args": [
-    [
-      {
-        "raw": "q@^1.4.1",
-        "scope": null,
-        "escapedName": "q",
-        "name": "q",
-        "rawSpec": "^1.4.1",
-        "spec": ">=1.4.1 <2.0.0",
-        "type": "range"
-      },
-      "/Users/shazron/Documents/git/apache/cordova-ios"
-    ]
-  ],
-  "_from": "q@>=1.4.1 <2.0.0",
-  "_id": "q@1.4.1",
+  "_from": "q@^1.4.1",
+  "_id": "q@1.5.0",
   "_inBundle": true,
-  "_inCache": true,
+  "_integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
   "_location": "/cordova-ios/q",
-  "_nodeVersion": "1.8.1",
-  "_npmUser": {
-    "name": "kriskowal",
-    "email": "kris.kowal@cixar.com"
-  },
-  "_npmVersion": "2.8.3",
   "_phantomChildren": {},
   "_requested": {
+    "type": "range",
+    "registry": true,
     "raw": "q@^1.4.1",
-    "scope": null,
-    "escapedName": "q",
     "name": "q",
+    "escapedName": "q",
     "rawSpec": "^1.4.1",
-    "spec": ">=1.4.1 <2.0.0",
-    "type": "range"
+    "saveSpec": null,
+    "fetchSpec": "^1.4.1"
   },
   "_requiredBy": [
     "/cordova-ios",
     "/cordova-ios/cordova-common"
   ],
-  "_resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-  "_shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+  "_shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
   "_spec": "q@^1.4.1",
-  "_where": "/Users/shazron/Documents/git/apache/cordova-ios",
+  "_where": "/Users/spindori/Documents/Cordova/cordova-ios",
   "author": {
     "name": "Kris Kowal",
     "email": "kris@cixar.com",
@@ -51,6 +31,7 @@
   "bugs": {
     "url": "http://github.com/kriskowal/q/issues"
   },
+  "bundleDependencies": false,
   "contributors": [
     {
       "name": "Kris Kowal",
@@ -69,6 +50,7 @@
     }
   ],
   "dependencies": {},
+  "deprecated": false,
   "description": "A library for promises (CommonJS/Promises/A,B,D)",
   "devDependencies": {
     "cover": "*",
@@ -84,10 +66,6 @@
   "directories": {
     "test": "./spec"
   },
-  "dist": {
-    "shasum": "55705bcd93c5f3673530c2c2cbc0c2b3addc286e",
-    "tarball": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
-  },
   "engines": {
     "node": ">=0.6.0",
     "teleport": ">=0.2.0"
@@ -97,7 +75,6 @@
     "q.js",
     "queue.js"
   ],
-  "gitHead": "d373079d3620152e3d60e82f27265a09ee0e81bd",
   "homepage": "https://github.com/kriskowal/q",
   "keywords": [
     "q",
@@ -113,23 +90,9 @@
     "browser",
     "node"
   ],
-  "license": {
-    "type": "MIT",
-    "url": "http://github.com/kriskowal/q/raw/master/LICENSE"
-  },
+  "license": "MIT",
   "main": "q.js",
-  "maintainers": [
-    {
-      "name": "kriskowal",
-      "email": "kris.kowal@cixar.com"
-    },
-    {
-      "name": "domenic",
-      "email": "domenic@domenicdenicola.com"
-    }
-  ],
   "name": "q",
-  "optionalDependencies": {},
   "overlay": {
     "teleport": {
       "dependencies": {
@@ -147,8 +110,8 @@
     "lint": "jshint q.js",
     "minify": "grunt",
     "prepublish": "grunt",
-    "test": "jasmine-node spec && promises-aplus-tests spec/aplus-adapter",
+    "test": "npm ls -s && jasmine-node spec && promises-aplus-tests spec/aplus-adapter && npm run -s lint",
     "test-browser": "opener spec/q-spec.html"
   },
-  "version": "1.4.1"
+  "version": "1.5.0"
 }
diff --git a/StoneIsland/platforms/ios/cordova/node_modules/q/q.js b/StoneIsland/platforms/ios/cordova/node_modules/q/q.js
index cf5339e3..14dc24a6 100755
--- a/StoneIsland/platforms/ios/cordova/node_modules/q/q.js
+++ b/StoneIsland/platforms/ios/cordova/node_modules/q/q.js
@@ -1,8 +1,8 @@
 // vim:ts=4:sts=4:sw=4:
 /*!
  *
- * Copyright 2009-2012 Kris Kowal under the terms of the MIT
- * license found at http://github.com/kriskowal/q/raw/master/LICENSE
+ * Copyright 2009-2017 Kris Kowal under the terms of the MIT
+ * license found at https://github.com/kriskowal/q/blob/v1/LICENSE
  *
  * With parts by Tyler Close
  * Copyright 2007-2009 Tyler Close under the terms of the MIT X license found
@@ -190,7 +190,7 @@ var nextTick =(function () {
         //   `setTimeout`. In this case `setImmediate` is preferred because
         //    it is faster. Browserify's `process.toString()` yields
         //   "[object Object]", while in a real Node environment
-        //   `process.nextTick()` yields "[object process]".
+        //   `process.toString()` yields "[object process]".
         isNodeJS = true;
 
         requestTick = function () {
@@ -327,6 +327,11 @@ var object_create = Object.create || function (prototype) {
     return new Type();
 };
 
+var object_defineProperty = Object.defineProperty || function (obj, prop, descriptor) {
+    obj[prop] = descriptor.value;
+    return obj;
+};
+
 var object_hasOwnProperty = uncurryThis(Object.prototype.hasOwnProperty);
 
 var object_keys = Object.keys || function (object) {
@@ -377,19 +382,20 @@ function makeStackTraceLong(error, promise) {
         promise.stack &&
         typeof error === "object" &&
         error !== null &&
-        error.stack &&
-        error.stack.indexOf(STACK_JUMP_SEPARATOR) === -1
+        error.stack
     ) {
         var stacks = [];
         for (var p = promise; !!p; p = p.source) {
-            if (p.stack) {
+            if (p.stack && (!error.__minimumStackCounter__ || error.__minimumStackCounter__ > p.stackCounter)) {
+                object_defineProperty(error, "__minimumStackCounter__", {value: p.stackCounter, configurable: true});
                 stacks.unshift(p.stack);
             }
         }
         stacks.unshift(error.stack);
 
         var concatedStacks = stacks.join("\n" + STACK_JUMP_SEPARATOR + "\n");
-        error.stack = filterStackString(concatedStacks);
+        var stack = filterStackString(concatedStacks);
+        object_defineProperty(error, "stack", {value: stack, configurable: true});
     }
 }
 
@@ -516,6 +522,14 @@ Q.nextTick = nextTick;
  */
 Q.longStackSupport = false;
 
+/**
+ * The counter is used to determine the stopping point for building
+ * long stack traces. In makeStackTraceLong we walk backwards through
+ * the linked list of promises, only stacks which were created before
+ * the rejection are concatenated.
+ */
+var longStackCounter = 1;
+
 // enable long stacks if Q_DEBUG is set
 if (typeof process === "object" && process && process.env && process.env.Q_DEBUG) {
     Q.longStackSupport = true;
@@ -588,6 +602,7 @@ function defer() {
             // At the same time, cut off the first line; it's always just
             // "[object Promise]\n", as per the `toString`.
             promise.stack = e.stack.substring(e.stack.indexOf("\n") + 1);
+            promise.stackCounter = longStackCounter++;
         }
     }
 
@@ -597,7 +612,12 @@ function defer() {
 
     function become(newPromise) {
         resolvedPromise = newPromise;
-        promise.source = newPromise;
+
+        if (Q.longStackSupport && hasStacks) {
+            // Only hold a reference to the new promise if long stacks
+            // are enabled to reduce memory usage
+            promise.source = newPromise;
+        }
 
         array_reduce(messages, function (undefined, message) {
             Q.nextTick(function () {
@@ -725,7 +745,7 @@ Promise.prototype.join = function (that) {
             // TODO: "===" should be Object.is or equiv
             return x;
         } else {
-            throw new Error("Can't join: not the same: " + x + " " + y);
+            throw new Error("Q can't join: not the same: " + x + " " + y);
         }
     });
 };
@@ -1622,13 +1642,12 @@ function any(promises) {
         function onFulfilled(result) {
             deferred.resolve(result);
         }
-        function onRejected() {
+        function onRejected(err) {
             pendingCount--;
             if (pendingCount === 0) {
-                deferred.reject(new Error(
-                    "Can't get fulfillment value from any promise, all " +
-                    "promises were rejected."
-                ));
+                err.message = ("Q can't get fulfillment value from any promise, all " +
+                    "promises were rejected. Last error message: " + err.message);
+                deferred.reject(err);
             }
         }
         function onProgress(progress) {
@@ -1752,6 +1771,9 @@ Q["finally"] = function (object, callback) {
 
 Promise.prototype.fin = // XXX legacy
 Promise.prototype["finally"] = function (callback) {
+    if (!callback || typeof callback.apply !== "function") {
+        throw new Error("Q can't apply finally callback");
+    }
     callback = Q(callback);
     return this.then(function (value) {
         return callback.fcall().then(function () {
@@ -1915,6 +1937,9 @@ Promise.prototype.nfcall = function (/*...args*/) {
  */
 Q.nfbind =
 Q.denodeify = function (callback /*...args*/) {
+    if (callback === undefined) {
+        throw new Error("Q can't wrap an undefined function");
+    }
     var baseArgs = array_slice(arguments, 1);
     return function () {
         var nodeArgs = baseArgs.concat(array_slice(arguments));
diff --git a/StoneIsland/platforms/ios/cordova/node_modules/shelljs/package.json b/StoneIsland/platforms/ios/cordova/node_modules/shelljs/package.json
index 43438d32..24c80764 100755
--- a/StoneIsland/platforms/ios/cordova/node_modules/shelljs/package.json
+++ b/StoneIsland/platforms/ios/cordova/node_modules/shelljs/package.json
@@ -1,38 +1,19 @@
 {
-  "_args": [
-    [
-      {
-        "raw": "shelljs@^0.5.3",
-        "scope": null,
-        "escapedName": "shelljs",
-        "name": "shelljs",
-        "rawSpec": "^0.5.3",
-        "spec": ">=0.5.3 <0.6.0",
-        "type": "range"
-      },
-      "/Users/shazron/Documents/git/apache/cordova-ios"
-    ]
-  ],
-  "_from": "shelljs@>=0.5.3 <0.6.0",
+  "_from": "shelljs@^0.5.3",
   "_id": "shelljs@0.5.3",
   "_inBundle": true,
-  "_inCache": true,
+  "_integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=",
   "_location": "/cordova-ios/shelljs",
-  "_nodeVersion": "1.2.0",
-  "_npmUser": {
-    "name": "artur",
-    "email": "arturadib@gmail.com"
-  },
-  "_npmVersion": "2.5.1",
   "_phantomChildren": {},
   "_requested": {
+    "type": "range",
+    "registry": true,
     "raw": "shelljs@^0.5.3",
-    "scope": null,
-    "escapedName": "shelljs",
     "name": "shelljs",
+    "escapedName": "shelljs",
     "rawSpec": "^0.5.3",
-    "spec": ">=0.5.3 <0.6.0",
-    "type": "range"
+    "saveSpec": null,
+    "fetchSpec": "^0.5.3"
   },
   "_requiredBy": [
     "/cordova-ios",
@@ -40,9 +21,8 @@
   ],
   "_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
   "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113",
-  "_shrinkwrap": null,
   "_spec": "shelljs@^0.5.3",
-  "_where": "/Users/shazron/Documents/git/apache/cordova-ios",
+  "_where": "/Users/spindori/Documents/Cordova/cordova-ios",
   "author": {
     "name": "Artur Adib",
     "email": "arturadib@gmail.com"
@@ -53,20 +33,16 @@
   "bugs": {
     "url": "https://github.com/arturadib/shelljs/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {},
+  "deprecated": false,
   "description": "Portable Unix shell commands for Node.js",
   "devDependencies": {
     "jshint": "~2.1.11"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113",
-    "tarball": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"
-  },
   "engines": {
     "node": ">=0.8.0"
   },
-  "gitHead": "22d0975040b9b8234755dc6e692d6869436e8485",
   "homepage": "http://github.com/arturadib/shelljs",
   "keywords": [
     "unix",
@@ -78,12 +54,6 @@
   ],
   "license": "BSD*",
   "main": "./shell.js",
-  "maintainers": [
-    {
-      "name": "artur",
-      "email": "arturadib@gmail.com"
-    }
-  ],
   "name": "shelljs",
   "optionalDependencies": {},
   "repository": {