Handle 404 xhr status on unavailable components of a cell

peterwmwong · Oct 28, 2010 · d226167 · d226167
1 parent aa487d5
commit d226167
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 51 deletions.
diff --git a/dist/current/cell-noRenderers.js b/dist/current/cell-noRenderers.js
@@ -408,7 +408,7 @@ require.def('cell/util/loadComponents',
             // Do not explicitly handle errors, those should be
             // visible via console output in the browser.
             if (xhr.readyState === 4) {
-               callback(xhr.responseText);
+               callback(xhr.responseText, (xhr.status === 404));
             }
          };
          xhr.send(null);
@@ -426,8 +426,6 @@ require.def('cell/util/loadComponents',
 
             if (!errors) {
                cb(result, url);
-            } else {
-               ctx.errors.push(errors);
             }
 
             // Wait until all components are loaded
@@ -451,7 +449,8 @@ require.def('cell/util/loadComponents',
       __resloader('template',_loadingCtx,loadTplCb);
       __resloader('styling',_loadingCtx,loadStyleCb);
    };
-});require.def('cell/util/renderCSS',
+});
+require.def('cell/util/renderCSS',
    [ 'cell/config' ], 
    function(config) {
    return function(cname, styling){
@@ -592,11 +591,11 @@ require.def('cell/Cell',
                 console.log(err);
              });
 
-          }else{
+          }
              // Call Load Callback passing reference to Cell and errors 
              try{
                 if(typeof ctx.loadCb === 'function'){
-                  ctx.loadCb();
+                  ctx.loadCb(errors);
                 }
              }catch(e){
                 console.log('cell.Cell.resumeLoad(): error thrown calling Load Callback for "'+this.name+'" Cell',e);
@@ -628,7 +627,7 @@ require.def('cell/Cell',
 
                 delete ctx.renderRequests;
              }
-          }
+
        };
 
    return createClass({

diff --git a/dist/current/cell.js b/dist/current/cell.js
@@ -408,7 +408,7 @@ require.def('cell/util/loadComponents',
             // Do not explicitly handle errors, those should be
             // visible via console output in the browser.
             if (xhr.readyState === 4) {
-               callback(xhr.responseText);
+               callback(xhr.responseText, (xhr.status === 404));
             }
          };
          xhr.send(null);
@@ -426,8 +426,6 @@ require.def('cell/util/loadComponents',
 
             if (!errors) {
                cb(result, url);
-            } else {
-               ctx.errors.push(errors);
             }
 
             // Wait until all components are loaded
@@ -451,7 +449,8 @@ require.def('cell/util/loadComponents',
       __resloader('template',_loadingCtx,loadTplCb);
       __resloader('styling',_loadingCtx,loadStyleCb);
    };
-});require.def('cell/util/renderCSS',
+});
+require.def('cell/util/renderCSS',
    [ 'cell/config' ], 
    function(config) {
    return function(cname, styling){
@@ -592,11 +591,11 @@ require.def('cell/Cell',
                 console.log(err);
              });
 
-          }else{
+          }
              // Call Load Callback passing reference to Cell and errors 
              try{
                 if(typeof ctx.loadCb === 'function'){
-                  ctx.loadCb();
+                  ctx.loadCb(errors);
                 }
              }catch(e){
                 console.log('cell.Cell.resumeLoad(): error thrown calling Load Callback for "'+this.name+'" Cell',e);
@@ -628,7 +627,7 @@ require.def('cell/Cell',
 
                 delete ctx.renderRequests;
              }
-          }
+
        };
 
    return createClass({

diff --git a/src/cell/Cell.js b/src/cell/Cell.js
@@ -49,43 +49,44 @@ require.def('cell/Cell',
                 console.log(err);
              });
 
-          }else{
-             // Call Load Callback passing reference to Cell and errors 
-             try{
-                if(typeof ctx.loadCb === 'function'){
-                  ctx.loadCb();
-                }
-             }catch(e){
-                console.log('cell.Cell.resumeLoad(): error thrown calling Load Callback for "'+this.name+'" Cell',e);
+          }
+
+          // Call Load Callback passing reference to Cell and errors 
+          try{
+             if(typeof ctx.loadCb === 'function'){
+               ctx.loadCb(errors);
              }
-             delete ctx.loadCb;
+          }catch(e){
+             console.log('cell.Cell.resumeLoad(): error thrown calling Load Callback for "'+this.name+'" Cell',e);
+          }
+          delete ctx.loadCb;
+
+          // Render template if there were requests while loading Cell  
+          if(this.template){
 
-             // Render template if there were requests while loading Cell  
-             if(this.template){
-
-                // Render styling
-                if(this.styling){
-                   renderCSS(this.name, this.styling);
-                }
-
-                var _this = this;
-                ctx.renderRequests.forEach(function(req){
-                   try{
-                      __render(_this,
-                               ctx,
-                               req.domNodes, 
-                               req.replaceNodes,
-                               req.data,
-                               req.cb,
-                               req.id);
-                   }catch(e){
-                      console.log('cell.Cell.resumeLoad(): error thrown rendering "'+this.name+'" Cell',req,e);
-                   }
-                });
-
-                delete ctx.renderRequests;
+             // Render styling
+             if(this.styling){
+                renderCSS(this.name, this.styling);
              }
+
+             var _this = this;
+             ctx.renderRequests.forEach(function(req){
+                try{
+                   __render(_this,
+                            ctx,
+                            req.domNodes, 
+                            req.replaceNodes,
+                            req.data,
+                            req.cb,
+                            req.id);
+                }catch(e){
+                   console.log('cell.Cell.resumeLoad(): error thrown rendering "'+this.name+'" Cell',req,e);
+                }
+             });
+
+             delete ctx.renderRequests;
           }
+
        };
 
    return createClass({

diff --git a/src/cell/util/loadComponents.js b/src/cell/util/loadComponents.js
@@ -24,7 +24,7 @@ require.def('cell/util/loadComponents',
             // Do not explicitly handle errors, those should be
             // visible via console output in the browser.
             if (xhr.readyState === 4) {
-               callback(xhr.responseText);
+               callback(xhr.responseText, (xhr.status === 404));
             }
          };
          xhr.send(null);
@@ -42,8 +42,6 @@ require.def('cell/util/loadComponents',
 
             if (!errors) {
                cb(result, url);
-            } else {
-               ctx.errors.push(errors);
             }
 
             // Wait until all components are loaded
@@ -67,4 +65,4 @@ require.def('cell/util/loadComponents',
       __resloader('template',_loadingCtx,loadTplCb);
       __resloader('styling',_loadingCtx,loadStyleCb);
    };
-});
+});