Merge branch '3d-tiles-cleanup' into request-scheduler-again

CesiumGS · Jun 13, 2017 · 4c5f488 · 4c5f488
2 parents 02ba0eb + b45579b
commit 4c5f488
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/Source/Scene/Cesium3DTileStyle.js b/Source/Scene/Cesium3DTileStyle.js
@@ -65,7 +65,6 @@ define([
     function Cesium3DTileStyle(style) {
         this._style = undefined;
         this._ready = false;
-        this._readyPromise = when.defer();
         this._color = undefined;
         this._show = undefined;
         this._pointSize = undefined;
@@ -78,19 +77,17 @@ define([
         this._showShaderFunctionReady = false;
         this._pointSizeShaderFunctionReady = false;
 
-        var that = this;
         var promise;
         if (typeof style === 'string') {
             promise = RequestScheduler.request(style, loadJson);
         } else {
             promise = when.resolve(style);
         }
 
-        promise.then(function(styleJson) {
+        var that = this;
+        this._readyPromise = promise.then(function(styleJson) {
             setup(that, styleJson);
-            that._readyPromise.resolve(that);
-        }).otherwise(function(error) {
-            that._readyPromise.reject(error);
+            return that;
         });
     }
 

diff --git a/Specs/Scene/Instanced3DModel3DTileContentSpec.js b/Specs/Scene/Instanced3DModel3DTileContentSpec.js
@@ -67,10 +67,6 @@ defineSuite([
         scene.primitives.removeAll();
     });
 
-    it ('gets properties', function() {
-
-    });
-
     it('throws with invalid format', function() {
         var arrayBuffer = Cesium3DTilesTester.generateInstancedTileBuffer({
             gltfFormat : 2