3D Tiles - Ternary Functions

Apps/Sandcastle/CesiumSandcastle.js

@@ -1,6 +1,5 @@
 /*global require,Blob,JSHINT*/
 /*global gallery_demos*/// defined by gallery/gallery-index.js, created by build
-/*global hello_world_index*/// defined in gallery/gallery-index.js, created by build
 /*global sandcastleJsHintOptions*/// defined by jsHintOptions.js, created by build
 require({
     baseUrl : '../../Source',
@@ -139,7 +138,6 @@ require({
     var subtabs = {};
     var docError = false;
     var galleryError = false;
-    var notFound = false;
     var galleryTooltipTimer;
     var activeGalleryTooltipDemo;
     var demoTileHeightRule = findCssStyle('.demoTileThumbnail');
@@ -307,7 +305,7 @@ require({
         var selectedTabName = registry.byId('innerPanel').selectedChildWidget.title;
         var suffix = selectedTabName + 'Demos';
         if (selectedTabName === 'All') {
-            suffix = 'all';
+            suffix = '';
         } else if (selectedTabName === 'Search Results') {
             suffix = 'searchDemo';
         }
@@ -695,7 +693,6 @@ require({
     }
 
     function loadFromGallery(demo) {
-        notFound = false;
         document.getElementById('saveAsFile').download = demo.name + '.html';
         registry.byId('description').set('value', decodeHTML(demo.description).replace(/\\n/g, '\n'));
         registry.byId('label').set('value', decodeHTML(demo.label).replace(/\\n/g, '\n'));
@@ -806,9 +803,6 @@ require({
                 if (galleryError) {
                     appendConsole('consoleError', 'Error loading gallery, please run the build script.', true);
                 }
-                if (notFound) {
-                    appendConsole('consoleLog', 'Unable to load demo named ' + queryObject.src.replace('.html', '') + '\n', true);
-                }
             }
         } else if (Cesium.defined(e.data.log)) {
             // Console log messages from the iframe display in Sandcastle.
@@ -1060,15 +1054,8 @@ require({
             url : 'gallery/' + name + '.html',
             handleAs : 'text',
             error : function(error) {
-                if (error.status === 404) {
-                    loadFromGallery(gallery_demos[hello_world_index])
-                        .then(function() {
-                            notFound = true;
-                        });
-                } else {
-                    galleryError = true;
-                    appendConsole('consoleError', error, true);
-                }
+                appendConsole('consoleError', error, true);
+                galleryError = true;
             }
         });
     }

Apps/Sandcastle/gallery/3D Models.html

@@ -94,4 +94,4 @@
 }
 </script>
 </body>
-</html>
+</html>