Merge branch 'master' into traversal-cleanup

.eslintignore

@@ -8,3 +8,5 @@ Source/ThirdParty/**
 Source/Workers/cesiumWorkerBootstrapper.js
 ThirdParty/**
 Tools/**
+Apps/Sandcastle/jsHintOptions.js
+Apps/Sandcastle/gallery/gallery-index.js

.travis.yml

@@ -2,6 +2,8 @@ language: node_js
 node_js:
   - "8"
 sudo: false
+addons:
+  chrome: stable
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -17,7 +19,7 @@ script:
 
   - echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
   - npm run build
-  - npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed
+  - npm run test -- --browsers ChromeCI --webgl-stub --failTaskOnError --suppressPassed
   - echo -en 'travis_fold:end:script.test\\r'
 
   - echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r'
@@ -36,7 +38,7 @@ script:
   - echo -en 'travis_fold:end:script.deploy\\r'
 
   - echo 'test webgl-stub release' && echo -en 'travis_fold:start:script test.release\\r'
-  - npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
+  - npm run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed
   - echo -en 'travis_fold:end:script test.release\\r'
 
   - echo 'test node' && echo -en 'travis_fold:start:script test.node\\r'

Apps/Sandcastle/CesiumSandcastle.js

@@ -27,10 +27,10 @@ require({
         location: '../Apps/Sandcastle/ThirdParty'
     }]
 }, [
-        "dijit/Dialog",
-        "dijit/form/Button",
-        "dijit/form/Form",
-        "dijit/form/Textarea",
+        'dijit/Dialog',
+        'dijit/form/Button',
+        'dijit/form/Form',
+        'dijit/form/Textarea',
         'CodeMirror/lib/codemirror',
         'dijit/layout/ContentPane',
         'dijit/popup',
@@ -549,10 +549,10 @@ require({
                '//Sandcastle_End\n' +
                '    Sandcastle.finishedLoading();\n' +
                '}\n' +
-               'if (typeof Cesium !== "undefined") {\n' +
+               'if (typeof Cesium !== \'undefined\') {\n' +
                '    startup(Cesium);\n' +
-               '} else if (typeof require === "function") {\n' +
-               '    require(["Cesium"], startup);\n' +
+               '} else if (typeof require === \'function\') {\n' +
+               '    require([\'Cesium\'], startup);\n' +
                '}\n';
     }
 
@@ -949,7 +949,7 @@ require({
     });
 
     registry.byId('buttonImport').on('click', function() {
-        var gistId = document.getElementById("gistId").value;
+        var gistId = document.getElementById('gistId').value;
         var gistParameter = '&gist=';
         var gistIndex = gistId.indexOf(gistParameter);
         if (gistIndex !== -1) {
@@ -1196,7 +1196,7 @@ require({
         demoLink.className = 'linkButton';
         demoLink.href = 'gallery/' + encodeURIComponent(demo.name) + '.html';
 
-        if (demo.name === "Hello World") {
+        if (demo.name === 'Hello World') {
             newDemo = demo;
         }
         demoLink.onclick = function(e) {

Apps/Sandcastle/LinkButton.js

@@ -15,19 +15,19 @@ define([
     'use strict';
 
     return declare('Sandcastle.LinkButton', [_WidgetBase, _TemplatedMixin, _CssStateMixin], {
-        baseClass : "dijitButton",
+        baseClass : 'dijitButton',
         templateString : template,
         showLabel : true,
 
         _setShowLabelAttr : function(val) {
             if (this.containerNode) {
-                domClass.toggle(this.containerNode, "dijitDisplayNone", !val);
+                domClass.toggle(this.containerNode, 'dijitDisplayNone', !val);
             }
-            this._set("showLabel", val);
+            this._set('showLabel', val);
         },
 
         _setLabelAttr : function(/*String*/content) {
-            this._set("label", content);
+            this._set('label', content);
             (this.containerNode || this.focusNode).innerHTML = content;
         }
     });

Apps/Sandcastle/gallery/3D Models Coloring.html

@@ -233,10 +233,10 @@
 //Sandcastle_End
 Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Models.html

@@ -10,7 +10,7 @@
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-        if(typeof require === "function") {
+        if(typeof require === 'function') {
             require.config({
                 baseUrl : '../../../Source',
                 waitSeconds : 120
@@ -95,10 +95,10 @@
 //Sandcastle_End
     Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Tiles Adjust Height.html

@@ -80,10 +80,10 @@
 //Sandcastle_End
 Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Tiles BIM.html

@@ -2,18 +2,20 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">  <!-- Use Chrome Frame in IE -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
     <meta name="description" content="A sample BIM dataset rendered with 3D Tiles.">
     <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
     <title>Cesium Demo</title>
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-    require.config({
-        baseUrl : '../../../Source',
-        waitSeconds : 60
-    });
+        if(typeof require === 'function') {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
     </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
@@ -38,12 +40,12 @@
     console.log(error);
 });
 //Sandcastle_End
-Sandcastle.finishedLoading();
+    Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html

@@ -100,55 +100,55 @@
 addStyle('No style', {});
 
 addStyle('Color by building', {
-    "color" : {
-        "conditions" : [
+    'color' : {
+        'conditions' : [
             ["${building_name} === 'building0'", "color('purple')"],
             ["${building_name} === 'building1'", "color('red')"],
             ["${building_name} === 'building2'", "color('orange')"],
-            ["true", "color('blue')"]
+            ['true', "color('blue')"]
         ]
     }
 });
 
 addStyle('Color all doors', {
-    "color" : {
-        "conditions" : [
+    'color' : {
+        'conditions' : [
             ["isExactClass('door')", "color('orange')"],
-            ["true", "color('white')"]
+            ['true', "color('white')"]
         ]
     }
 });
 
 addStyle('Color all features derived from door', {
-    "color" : {
-        "conditions" : [
+    'color' : {
+        'conditions' : [
             ["isClass('door')", "color('orange')"],
-            ["true", "color('white')"]
+            ['true', "color('white')"]
         ]
     }
 });
 
 addStyle('Color features by class name', {
-    "defines" : {
-        "suffix" : "regExp('door(.*)').exec(getExactClassName())"
+    'defines' : {
+        'suffix' : "regExp('door(.*)').exec(getExactClassName())"
     },
-    "color" : {
-        "conditions" : [
+    'color' : {
+        'conditions' : [
             ["${suffix} === 'knob'", "color('yellow')"],
             ["${suffix} === ''", "color('lime')"],
-            ["${suffix} === null", "color('gray')"],
-            ["true", "color('blue')"]
+            ['${suffix} === null', "color('gray')"],
+            ['true', "color('blue')"]
         ]
     }
 });
 
 addStyle('Style by height', {
-    "color" : {
-        "conditions" : [
-            ["${height} >= 10", "color('purple')"],
-            ["${height} >= 6", "color('red')"],
-            ["${height} >= 5", "color('orange')"],
-            ["true", "color('blue')"]
+    'color' : {
+        'conditions' : [
+            ['${height} >= 10', "color('purple')"],
+            ['${height} >= 6', "color('red')"],
+            ['${height} >= 5', "color('orange')"],
+            ['true', "color('blue')"]
         ]
     }
 });
@@ -200,10 +200,10 @@
 //Sandcastle_End
 Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html

@@ -264,10 +264,10 @@
 //Sandcastle_End
 Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>

Apps/Sandcastle/gallery/3D Tiles Feature Picking.html

@@ -238,10 +238,10 @@
 //Sandcastle_End
 Sandcastle.finishedLoading();
 }
-if (typeof Cesium !== "undefined") {
+if (typeof Cesium !== 'undefined') {
     startup(Cesium);
-} else if (typeof require === "function") {
-    require(["Cesium"], startup);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
 }
 </script>
 </body>