Add event listener evolution to new standard supporting options object as third argument

.gitignore

@@ -23,7 +23,7 @@ log.txt
 atlassian-ide-plugin.xml
 
 ### VisualStudioCode ###
-.vscode/*
+#.vscode/*
 .vscode-upload.json
 .eslintrc.json
 

.vscode/launch.json

@@ -0,0 +1,80 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/services/shopify-admin-scripts/get-customers.js"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "npm test",
+            "runtimeVersion": "12.18.4",
+            "runtimeArgs": [
+                "${workspaceFolder}/test/run-node.js",
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Run collections Jasmine Tests",
+            "runtimeExecutable": "node",
+            "program": "${workspaceFolder}/core/collections/test/run-node.js",
+            "args": [ "core/collections/test/spec", "--verbose"],
+			"cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "autoAttachChildProcesses": true,
+            "trace": false,
+            "enableContentValidation": false
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Run frb Jasmine Tests",
+            "program": "${workspaceFolder}/node_modules/jasmine-node/bin/jasmine-node",
+            "args": [ "core/frb/spec", "--verbose"],
+			"cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "autoAttachChildProcesses": true,
+            "trace": false,
+            "enableContentValidation": false
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "npm test mr",
+            "runtimeExecutable": "~/.nvm/versions/node/v12.18.4/bin/node",
+            "program": "${workspaceFolder}/core/mr/test/run-node.js"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "compile time zones",
+            "runtimeVersion": "default",
+            "cwd": "${workspaceFolder}/core/date/tools/",
+            "program": "${workspaceFolder}/core/date/tools/compile-zones.js"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Run promise-io Jasmine Tests",
+            "runtimeExecutable": "~/.nvm/versions/node/v12.18.4/bin/node",
+            "autoAttachChildProcesses": true,
+            "program": "${workspaceFolder}/node_modules/jasmine-node/bin/jasmine-node",
+            "args": [ "${workspaceFolder}/core/promise-io/spec", "--verbose"],
+			"cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+
+        }
+
+
+    ]
+}

LICENSE.md

@@ -1,3 +1,6 @@
+ALL CHANGES IN THIS FORK ARE NOT OPEN SOURCE NOR AVAILABLE UNDER THE ORIGINAL LICENSE
+
+
 Montage
 ============
 Copyright (c) 2013, Adam Solove

composer/composer.js

@@ -3,7 +3,7 @@
  * @requires montage/core/target
  */
 var Target = require("../core/target").Target,
-    defaultEventManager = require("../core/event/event-manager").defaultEventManager;    
+    defaultEventManager = require("../core/event/event-manager").defaultEventManager;
 
 /**
  * The `Composer` helps to keep event normalization and calculation out of
@@ -70,6 +70,36 @@ exports.Composer = Target.specialize( /** @lends Composer# */ {
         }
     },
 
+        /**
+     * @private
+     * @property {Target} value
+     */
+    _nextTarget: {
+        value: null
+    },
+
+    /**
+     * The next Target to consider in the event target chain
+     *
+     * Currently, components themselves do not allow this chain to be broken;
+     * setting a component's nextTarget to a falsy value will cause nextTarget
+     * to resolve as the parentComponent.
+     *
+     * To interrupt the propagation path a Target that accepts a falsy
+     * nextTarget needs to be set at a component's nextTarget.
+     *
+     * @param {Target} value
+     * @returns {Target}
+     */
+    nextTarget: {
+        get: function () {
+            return this._nextTarget || this._component;
+        },
+        set: function (value) {
+            this._nextTarget = value;
+        }
+    },
+
     _shawdowRoot: {
         value: null
     },

core/application.js

@@ -13,6 +13,10 @@
 var Target = require("./target").Target,
     Template = require("./template"),
     MontageWindow = require("../window-loader/montage-window").MontageWindow,
+    Criteria = require("core/criteria").Criteria,
+    DataQuery = require("data/model/data-query").DataQuery,
+    UserIdentityService = undefined,
+    UserIdentityManager = require("data/service/user-identity-manager").UserIdentityManager,
     Slot;
 
 require("./dom");
@@ -32,17 +36,6 @@ var FIRST_LOAD_KEY_SUFFIX = "-is-first-load";
  */
 var Application = exports.Application = Target.specialize( /** @lends Application.prototype # */ {
 
-    /**
-     * Provides a reference to the Montage event manager used in the
-     * application.
-     *
-     * @property {EventManager} value
-     * @default null
-     */
-    eventManager: {
-        value: null
-    },
-
     /**
      * Provides a reference to the parent application.
      *
@@ -67,6 +60,14 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
         }
     },
 
+    url: {
+        get: function() {
+            return document && document.location
+                        ? new URL(document.location)
+                        :  null;
+        }
+    },
+
     /**
      * Provides a reference to the main application.
      *
@@ -428,6 +429,8 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
             ) {
                 this.parentApplication = window.loadInfo.parent.document.application;
             }
+
+            UserIdentityManager.delegate = this;
         }
     },
 
@@ -443,14 +446,86 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
             exports.application = self;
 
             return require.async("ui/component").then(function(exports) {
+                var authorizationPromise;
+
+                self.rootComponent = rootComponent = exports.__root__;
+                if (typeof document !== "undefined") {
+                    rootComponent.element = document;
+                }
+
+
+                /*
+
+                    TODO!!! Modify loading sequence to combine loader -> Authorization Panel -> Main
+
+                    While bringing the login panel up when there's an UpfrontAuthorizationPolicy before loading Main
+                    makes sense from both security and performance stand point, we shouldn't be skipping the loader.
+
+                    We should deserialize the loader, set the authentication panel as loader's Main, show the AuthenticationManager panel,
+                    and then bring the Main in
+                */
+
+                //URGENT: We need to further test that we don't already have a valid Authorization to use before authenticating.
+                return require.async("data/service/user-identity-service");
+            })
+            .then(function(exports) {
+                UserIdentityService = exports.UserIdentityService;
+
+                var userIdentityServices = UserIdentityService.userIdentityServices,
+                    userIdentityObjectDescriptors,
+                    authenticationPromise,
+                    //    userObjectDescriptor = this.
+                    selfUserCriteria,
+                    userIdentityQuery;
 
-                rootComponent = exports.__root__;
+                //Temporarily Bypassing authentication:
+                if(userIdentityServices && userIdentityServices.length > 0) {
+                    //Shortcut, there could be multiple one we need to flatten.
+                    userIdentityObjectDescriptors = userIdentityServices[0].types;
+
+                    if(userIdentityObjectDescriptors.length > 0) {
+                        //selfUserCriteria = new Criteria().initWithExpression("identity == $", "self");
+                        userIdentityQuery = DataQuery.withTypeAndCriteria(userIdentityObjectDescriptors[0]);
+
+                        authenticationPromise = self.mainService.fetchData(userIdentityQuery)
+                        .then(function(userIdenties) {
+                            self.userIdentity = userIdenties[0];
+                        });
+
+                    }
+                }
+                else {
+                    //Needs to beef-up the case we have a first anonymous user who could come back later.
+                    authenticationPromise = Promise.resolve(true);
+                }
+
+                return authenticationPromise.finally(function() {
+                    // if (typeof document !== "undefined") {
+                    //     rootComponent.element = document;
+                    // }
+
+                    if (typeof document !== "undefined") {
+                        return Template.instantiateDocument(document, applicationRequire);
+                    }
+
+                });
+
+
+/*
 
                 if (typeof document !== "undefined") {
                     rootComponent.element = document;
-                    return Template.instantiateDocument(document, applicationRequire);
                 }
 
+                return authorizationPromise.then(function(authorization) {
+                    if (typeof document !== "undefined") {
+                        return Template.instantiateDocument(document, applicationRequire);
+                    }
+                }, function(error) {
+                    console.error(error);
+                });
+                */
+
             }).then(function (part) {
                 self.callDelegateMethod("willFinishLoading", self);
                 rootComponent.needsDraw = true;
@@ -462,6 +537,8 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
         }
     },
 
+    //This should be replaced by a more robust user / session system with opt-in/delegate/configured
+    //from the outside.
     _loadApplicationContext: {
         value: function () {
             if (this._isFirstLoad === null) {
@@ -471,7 +548,7 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
 
                 if (typeof localStorage !== "undefined") {
                     localStorage.getItem(alreadyLoadedLocalStorageKey);
-                
+
                     if (hasAlreadyBeenLoaded === null) {
                         try {
                             localStorage.setItem(alreadyLoadedLocalStorageKey, true);
@@ -513,15 +590,17 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
     /**
      * @private
      */
-    _createPopupSlot: {value: function (zIndex) {
+    _createPopupSlot: {value: function (zIndex, className) {
         var slotEl = document.createElement('div');
         document.body.appendChild(slotEl);
         slotEl.style.zIndex = zIndex;
         slotEl.style.position = 'absolute';
+        slotEl.classList.add(className);
 
         var popupSlot = new Slot();
+        popupSlot.delegate = this;
         popupSlot.element = slotEl;
-        popupSlot.attachToParentComponent();
+        //popupSlot.attachToParentComponent();
         return popupSlot;
     }},
 
@@ -533,19 +612,22 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
             .then(function (exports) {
                 Slot = Slot || exports.Slot;
                 type = type || "custom";
-                var isSystemPopup = self._isSystemPopup(type), zIndex, popupSlot;
+                var isSystemPopup = self._isSystemPopup(type), zIndex, popupSlot, className;
                 self.popupSlots = self.popupSlots || {};
 
                 if(isSystemPopup) {
                     switch (type) {
                         case "alert":
                             zIndex = 19004;
+                            className = "montage-alert";
                             break;
                         case "confirm":
                             zIndex = 19003;
+                            className = "montage-confirm";
                             break;
                         case "notify":
                             zIndex = 19002;
+                            className = "montage-notify";
                             break;
                     }
                 } else {
@@ -556,15 +638,24 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
                         self._zIndex = self._zIndex + 1;
                     }
                     zIndex = self._zIndex;
+                    className = self.name;
+                    className += "-";
+                    className += type;
                 }
 
                 popupSlot = self.popupSlots[type];
                 if (!popupSlot) {
-                    popupSlot = self.popupSlots[type] = self._createPopupSlot(zIndex);
+                    popupSlot = self.popupSlots[type] = self._createPopupSlot(zIndex, className);
                 }
+
+                if(!popupSlot.inDocument) {
+                    self.rootComponent.addChildComponent(popupSlot);
+                }
+
                 // use the new zIndex for custom popup
                 if(!isSystemPopup) {
-                    popupSlot.element.style.zIndex = zIndex;
+                  //Benoit: Modifying DOM outside of draw loop here, though it's early...
+                  popupSlot.element.style.zIndex = zIndex;
                 }
 
                 popupSlot.content = content;
@@ -585,6 +676,17 @@ var Application = exports.Application = Target.specialize( /** @lends Applicatio
 
     }},
 
+    slotDidSwitchContent: {
+        value: function (slot) {
+            if(slot.content === null) {
+                slot.detachFromParentComponent();
+                //Benoit: can't believe we have to do that in 2 steps....
+                slot.element.parentNode.removeChild(slot.element);
+
+            }
+        }
+    },
+
     /**
      * @private
      */

core/bindings.js

@@ -8,4 +8,4 @@ require("./deprecate").deprecationWarning("montage/core/bindings", "montage/core
 /**
  * @deprecated console.log montage/core/bindings is deprecated, use montage/core/core instead
  */
-exports.Bindings = require("frb");
+exports.Bindings = require("core/frb/bindings");