From a3024011a91d3941f81481dd4d600e9684eb0fd4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 2 Feb 2012 00:11:51 -0800
Subject: upgrading to Montage v0.6

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 node_modules/montage/core/shim/immediate.js  | 57 ++++++++++++++++++
 node_modules/montage/core/shim/structures.js | 22 +++----
 node_modules/montage/core/shim/timers.js     | 87 ----------------------------
 3 files changed, 68 insertions(+), 98 deletions(-)
 create mode 100644 node_modules/montage/core/shim/immediate.js
 delete mode 100755 node_modules/montage/core/shim/timers.js

(limited to 'node_modules/montage/core/shim')

diff --git a/node_modules/montage/core/shim/immediate.js b/node_modules/montage/core/shim/immediate.js
new file mode 100644
index 00000000..3ac48f31
--- /dev/null
+++ b/node_modules/montage/core/shim/immediate.js
@@ -0,0 +1,57 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+/**
+    [setImmediate()]{@link setImmediate}
+    and [clearImmediate()]{@link clearImmediate} shim functions.
+    @see setImmediate
+    @see clearImmediate
+    @module montage/core/shim/immediate
+*/
+
+/**
+    @function
+    @name setImmediate
+    @global
+*/
+
+/**
+    @function
+    @name clearImmediate
+    @global
+*/
+
+(function (global) {
+
+var nextTick = require("../next-tick").nextTick;
+
+if (typeof setImmediate === "undefined") {
+
+    var nextHandle = 0;
+    var handles = {};
+
+    global.setImmediate = function setImmediate(callback) {
+        var handle = nextHandle++;
+        var args = arguments.length > 1 ?
+            Array.prototype.slice.call(arguments, 1) :
+            void 0;
+        handles[handle] = true;
+        nextTick(function () {
+            if (handles[handle]) {
+                callback.apply(void 0, args);
+                delete handles[handle];
+            }
+        });
+        return handle;
+    };
+
+    global.clearImmediate = function clearImmediate(handle) {
+        delete handles[handle];
+    };
+
+}
+
+})(typeof global === "undefined" ? window : global);
diff --git a/node_modules/montage/core/shim/structures.js b/node_modules/montage/core/shim/structures.js
index 2f3d7d05..fb8e2191 100755
--- a/node_modules/montage/core/shim/structures.js
+++ b/node_modules/montage/core/shim/structures.js
@@ -17,9 +17,9 @@
  @classdesc Provides a Map data structure for managing key/value pairs, including methods for querying and manipulating map elements. A map cannot contain duplicate keys; each key can map to at most one value.
  */
 exports.Map = Map;
-function Map(ignored, options) {
+function Map(reserved, options) {
     if (!(this instanceof Map)) {
-        return new Map(ignored, options);
+        return new Map(reserved, options);
     }
     options = options || {};
     var eq = options.eq || Set.eq;
@@ -131,9 +131,9 @@ Object.defineProperties(Map.prototype, /** @lends module:montage/core/shim/struc
  @class module:montage/core/shim/structures.Set
  */
 exports.Set = Set;
-function Set(ignored, options) {
+function Set(reserved, options) {
     if (!(this instanceof Set)) {
-        return new Set(ignored, options);
+        return new Set(reserved, options);
     }
     options = options || {};
     var eq = options.eq || Set.eq;
@@ -238,13 +238,13 @@ Object.defineProperties(Set.prototype, /** @lends module:montage/core/shim/struc
 });
 /**
     @class module:montage/core/shim/structures.OrderedSet
-    @param {boolean} ignored
+    @param {boolean} reserved
     @param {object} options
 */
 exports.OrderedSet = OrderedSet;
-function OrderedSet(ignored, options) {
+function OrderedSet(reserved, options) {
     if (!(this instanceof OrderedSet)) {
-        return new OrderedSet(ignored, options);
+        return new OrderedSet(reserved, options);
     }
     options = options || {};
     var eq = options.eq || OrderedSet.eq;
@@ -397,14 +397,14 @@ Set.hash = function (value) {
 /**
     @exports CacheMap
     @function
-    @param {Boolean} ignored
+    @param {Boolean} reserved
     @param {String} options
-    @returns new CacheMap(ignored, options)
+    @returns new CacheMap(reserved, options)
     */
 exports.CacheMap = CacheMap;
-function CacheMap(ignored, options) {
+function CacheMap(reserved, options) {
     if (!(this instanceof CacheMap)) {
-        return new CacheMap(ignored, options);
+        return new CacheMap(reserved, options);
     }
     options = options || {};
 
diff --git a/node_modules/montage/core/shim/timers.js b/node_modules/montage/core/shim/timers.js
deleted file mode 100755
index 859a7aec..00000000
--- a/node_modules/montage/core/shim/timers.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
- /**
-    Defines [setImmediate()]{@link setImmediate} and [clearImmediate()]{@link clearImmediate} shim functions.
-    @see setImmediate
-    @see clearImmediate
-    @module montage/core/shim/timers
- */
-
-/**
-    @function
-    @name setImmediate
-    @global
-*/
-
-/**
-    @function
-    @name clearImmediate
-    @global
-*/
-
-(function (global) {
-
-var nextTick;
-if (typeof process !== "undefined") {
-    nextTick = process.nextTick;
-} else if (typeof MessageChannel !== "undefined") {
-    // http://www.nonblocking.io/2011/06/windownexttick.html
-    var channel = new MessageChannel();
-    // linked list of tasks (single, with head node)
-    var head = {}, tail = head;
-
-    channel.port1.onmessage = function () {
-        var next = head.next;
-        var task = next.task;
-        head = next;
-        task();
-    };
-
-    nextTick = function (task) {
-        tail = tail.next = {task: task};
-        channel.port2.postMessage(void 0);
-    }
-} else if (typeof setTimeout !== "undefined") {
-
-    nextTick = function (callback) {
-        setTimeout(callback, 0);
-    };
-} else {
-    throw new Error("Can't shim setImmediate.");
-}
-
-if (typeof setImmediate === "undefined") {
-    var nextHandle = 0;
-    var handles = {};
-
-
-    global.setImmediate = function setImmediate(callback) {
-        var handle = nextHandle++;
-        var args = arguments.length > 1 ?
-            Array.prototype.slice.call(arguments, 1) :
-            void 0;
-        handles[handle] = true;
-        nextTick(function () {
-            if (handles[handle]) {
-                callback.apply(void 0, args);
-                delete handles[handle];
-            }
-        });
-        return handle;
-    };
-
-    global.clearImmediate = function clearImmediate(handle) {
-        delete handles[handle];
-    };
-}
-
-// Make this work as a <script> for bootstrapping montage.js
-if (typeof bootstrap !== "undefined") {
-    bootstrap("core/shim/timers", function () {});
-}
-
-})(typeof global === "undefined" ? window : global);
-- 
cgit v1.2.3