Merge remote-tracking branch 'origin/open669' into open-master

platform/commonUI/about/bundle.json

@@ -31,6 +31,11 @@
                 "key": "AboutController",
                 "depends": [ "versions[]", "$window" ],
                 "implementation": "AboutController.js"
+            },
+            {
+                "key": "LicenseController",
+                "depends": [ "licenses[]" ],
+                "implementation": "LicenseController.js"
             }
         ],
         "routes": [

platform/commonUI/about/res/templates/licenses.html

@@ -1 +1,33 @@
-Placeholder for open source licenses.
+<style>
+    .licenses { padding: 1em; }
+    .licenses th { font-weight: bold; padding: 0.5em; }
+    .licenses td { padding: 0.5em; }
+</style>
+
+<div ng-controller="LicenseController as lc" class="licenses">
+
+    <p>
+        This software includes components released under the following licenses.
+    </p>
+
+    <table>
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Version</th>
+                <th>Author</th>
+                <th>Description</th>
+                <th>License</th>
+            </tr>
+        </thead>
+        <tbody style="font-weight: normal;">
+            <tr ng-repeat="license in lc.licenses()">
+                <td><a ng-href="{{license.website}}">{{license.name}}</a></td>
+                <td>{{license.version}}</td>
+                <td>{{license.author}}</td>
+                <td>{{license.description}}</td>
+                <td><a ng-href="{{license.link}}">{{license.license}}</a></td>
+            </tr>
+        </tbody>
+    </table>
+</div>

platform/commonUI/about/src/LicenseController.js

@@ -0,0 +1,27 @@
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         * Provides extension-introduced licenses information to the
+         * licenses route.
+         * @constructor
+         */
+        function LicenseController(licenses) {
+            return {
+                /**
+                 * Get license information.
+                 * @returns {Array} license extensions
+                 */
+                licenses: function () {
+                    return licenses;
+                }
+            };
+        }
+
+        return LicenseController;
+    }
+);

platform/commonUI/about/test/LicenseControllerSpec.js

@@ -0,0 +1,30 @@
+/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
+
+define(
+    ['../src/LicenseController'],
+    function (LicenseController) {
+        "use strict";
+
+        describe("The License controller", function () {
+            var testLicenses,
+                controller;
+
+            beforeEach(function () {
+                testLicenses = [
+                    { name: "A" },
+                    { name: "B" },
+                    { name: "C" }
+                ];
+                controller = new LicenseController(testLicenses);
+            });
+
+            it("exposes license information", function () {
+                // LicenseController is just there to pass licenses[]
+                // extensions down to the template.
+                expect(controller.licenses()).toEqual(testLicenses);
+            });
+
+        });
+
+    }
+);

platform/commonUI/about/test/suite.json

@@ -1,4 +1,5 @@
 [
     "AboutController",
+    "LicenseController",
     "LogoController"
 ]

platform/commonUI/browse/bundle.json

@@ -119,6 +119,26 @@
                 "implementation": "creation/CreateActionProvider.js",
                 "depends": [ "typeService", "dialogService", "creationService" ]
             }
+        ],
+        "licenses": [
+            {
+                "name": "screenfull.js",
+                "version": "1.2.0",
+                "description": "Wrapper for cross-browser usage of fullscreen API.",
+                "author": "Sindre Sorhus",
+                "website": "https://github.com/sindresorhus/screenfull.js/",
+                "license": "MIT",
+                "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
+            },
+            {
+                "name": "Math.uuid.js",
+                "version": "1.4",
+                "description": "Unique identifer generation (code adapted.)",
+                "author": "Robert Kieffer",
+                "website": "https://github.com/broofa/node-uuid",
+                "license": "MIT",
+                "link": "http://opensource.org/licenses/MIT"
+            }
         ]
     }
 }

platform/commonUI/general/bundle.json

@@ -152,6 +152,26 @@
                 "templateUrl": "templates/controls/switcher.html",
                 "uses": [ "view" ]
             }
+        ],
+        "licenses": [
+            {
+                "name": "Modernizr",
+                "version": "2.6.2",
+                "description": "Browser/device capability finding.",
+                "author": "Faruk Ateş",
+                "website": "http://modernizr.com",
+                "license": "MIT",
+                "link": "http://modernizr.com/license/"
+            },
+            {
+                "name": "Normalize.css",
+                "version": "1.1.2",
+                "description": "Browser style normalization.",
+                "author": "Nicolas Gallagher, Jonathan Neal",
+                "website": "http://necolas.github.io/normalize.css/",
+                "license": "MIT",
+                "link": "https://github.com/necolas/normalize.css/blob/master/LICENSE.md"
+            }
         ]
     }
 }

platform/framework/bundle.json

@@ -13,5 +13,61 @@
         }
     },
     "extensions": {
+        "licenses": [
+            {
+                "name": "Blanket.js",
+                "version": "1.1.5",
+                "description": "Code coverage measurement and reporting.",
+                "author": "Alex Seville",
+                "website": "http://blanketjs.org/",
+                "license": "MIT",
+                "link": "http://opensource.org/licenses/MIT"
+            },
+            {
+                "name": "Jasmine",
+                "version": "1.3.1",
+                "description": "Unit testing.",
+                "author": "Pivotal Labs",
+                "website": "http://jasmine.github.io/",
+                "license": "MIT",
+                "link": "http://opensource.org/licenses/MIT"
+            },
+            {
+                "name": "RequireJS",
+                "version": "2.1.9",
+                "description": "Script loader.",
+                "author": "The Dojo Foundation",
+                "website": "http://requirejs.org/",
+                "license": "MIT",
+                "link": "https://github.com/jrburke/requirejs/blob/master/LICENSE"
+            },
+            {
+                "name": "AngularJS",
+                "version": "1.2.26",
+                "description": "Client-side web application framework.",
+                "author": "Google",
+                "website": "http://angularjs.org/",
+                "license": "MIT",
+                "link": "https://github.com/angular/angular.js/blob/master/LICENSE"
+            },
+            {
+                "name": "Angular-Route",
+                "version": "1.2.26",
+                "description": "Client-side view routing.",
+                "author": "Google",
+                "website": "http://angularjs.org/",
+                "license": "MIT",
+                "link": "https://github.com/angular/angular.js/blob/master/LICENSE"
+            },
+            {
+                "name": "ES6-Promise",
+                "version": "2.0.0",
+                "description": "Promise polyfill for pre-ECMAScript 6 browsers.",
+                "author": "Yehuda Katz, Tom Dale, Stefan Penner and contributors",
+                "website": "https://github.com/jakearchibald/es6-promise",
+                "license": "MIT",
+                "link": "https://github.com/jakearchibald/es6-promise/blob/master/LICENSE"
+            }
+        ]
     }
 }

platform/telemetry/bundle.json

@@ -44,6 +44,17 @@
                 "implementation": "TelemetrySubscriber.js",
                 "depends": [ "$q", "$timeout" ]
             }
+        ],
+        "licenses": [
+            {
+                "name": "Moment.js",
+                "version": "2.7.0",
+                "author": "Tim Wood, Iskren Chernev, Moment.js contributors",
+                "description": "Time/date parsing/formatting.",
+                "website": "http://momentjs.com",
+                "license": "MIT",
+                "link": "https://raw.githubusercontent.com/moment/moment/develop/LICENSE"
+            }
         ]
     }
 }