Changeset 14197

Timestamp:

06/27/08 15:04:35 (5 months ago)

Author:

toonetown

Message:

Fixes #6590 - add in message notifications for loading, error, and no data - similar to what exists in dijit.layout.ContentPane? !strict

Location:

dojox/trunk/grid

Files:

• DataGrid.js (modified) (4 diffs)
• nls (added)
• nls/grid.js (added)
• resources/Grid.css (modified) (1 diff)
• resources/nihiloGrid.css (modified) (1 diff)
• resources/soriaGrid.css (modified) (1 diff)
• resources/tundraGrid.css (modified) (1 diff)
• resources/_Grid.html (modified) (1 diff)
• tests/test_grid_messages.html (added)
• tests/test_grid_messages_autoheight.html (added)
• _Grid.js (modified) (5 diffs)

dojox/trunk/grid/DataGrid.js

@@ -21 +21 @@
         rowCount: 0,
 
+        _isLoaded: false,
+        _isLoading: false,
+        
         postCreate: function(){
                 this._pages = [];
@@ -129 +132 @@
                         }
                 }
+                if(!this._isLoaded){
+                        this._isLoading = false;
+                        this._isLoaded = true;
+                        if(!items || !items.length){
+                                this.showMessage(this.noDataMessage);
+                        }else{
+                                this.showMessage();
+                        }
+                }
                 this._pending_requests[req.start] = false;
         },
@@ -134 +146 @@
         _onFetchError: function(err, req){
                 console.log(err);
+                if(!this._isLoaded){
+                        this._isLoading = false;
+                        this._isLoaded = true;
+                        this.showMessage(this.errorMessage);
+                }
                 this.onFetchError(err, req);
         },
@@ -143 +160 @@
                 var start = start || 0;
                 if(this.store && !this._pending_requests[start]){
+                        if(!this._isLoaded && !this._isLoading){
+                                this._isLoading = true;
+                                this.showMessage(this.loadingMessage);
+                        }
                         this._pending_requests[start] = true;
                         //console.log("fetch: ", start);

dojox/trunk/grid/resources/Grid.css

@@ -27 +27 @@
 .dojoxGrid-master-view  {
         position: relative;
+}
+
+/* master messages */
+
+.dojoxGrid-master-messages {
+        position: relative;
+        padding: 1em;
+        text-align: center;
+        background-color: white;
 }
 

dojox/trunk/grid/resources/nihiloGrid.css

@@ -27 +27 @@
 .nihilo .dojoxGrid-master-view  {
         position: relative;
+}
+
+/* master messages */
+
+.nihilo .dojoxGrid-master-messages {
+        position: relative;
+        padding: 1em;
+        text-align: center;
+        background-color: #fefefe;
 }
 

dojox/trunk/grid/resources/soriaGrid.css

@@ -27 +27 @@
 .soria .dojoxGrid-master-view  {
         position: relative;
+}
+
+/* master messages */
+
+.soria .dojoxGrid-master-messages {
+        position: relative;
+        padding: 1em;
+        text-align: center;
+        background-color: #fefefe;
 }
 

dojox/trunk/grid/resources/tundraGrid.css

@@ -27 +27 @@
 .tundra .dojoxGrid-master-view  {
         position: relative;
+}
+
+/* master messages */
+
+.tundra .dojoxGrid-master-messages {
+        position: relative;
+        padding: 1em;
+        text-align: center;
+        background-color: #fefefe;
+}
+
+.tundra .dojoxGridLoading, 
+.tundra .dojoxGridError {
+        background-position:left center;
+        background-repeat: no-repeat;
+        padding-left:25px;
+}
+
+.dijitRtl .tundra .dojoxGridLoading, 
+.dijitRtl .tundra .dojoxGridError,
+.dijitRtl .tundra .dojoxGridNoData {
+        background-position:right;
+        padding-right:25px;
+        padding-left:0px;
+}
+
+.tundra .dojoxGridLoading {
+        background-image: url('../../../dijit/themes/tundra/images/loading.gif');
+}
+
+.tundra .dojoxGridError {
+        background-image: url('../../../dijit/themes/tundra/images/warning.png');
 }
 

dojox/trunk/grid/resources/_Grid.html

@@ -2 +2 @@
         <div class="dojoxGrid-master-header" dojoAttachPoint="viewsHeaderNode"></div>
         <div class="dojoxGrid-master-view" dojoAttachPoint="viewsNode"></div>
+        <div class="dojoxGrid-master-messages" style="display: none;" dojoAttachPoint="messagesNode"></div>
         <span dojoAttachPoint="lastFocusNode" tabindex="0"></span>
 </div>

dojox/trunk/grid/_Grid.js

@@ -15 +15 @@
 
 dojo.require("dijit.Menu");
+
+dojo.requireLocalization("dijit", "loading");
+dojo.requireLocalization("dojox.grid", "grid");
 
 (function(){
@@ -158 +161 @@
                 // Used to store the last two clicks, to ensure double-clicking occurs based on the intended row
                 _click: null,
+                
+                // loadingMessage: String
+                //  Message that shows while the grid is loading
+                loadingMessage: "<span class='dojoxGridLoading'>${loadingState}</span>",
+
+                // errorMessage: String
+                //  Message that shows when the grid encounters an error loading
+                errorMessage: "<span class='dojoxGridError'>${errorState}</span>",
+
+                // noDataMessage: String
+                //  Message that shows if the grid has no data
+                noDataMessage: "<span class='dojoxGridNoData'>${noData}</span>",
 
                 // private
@@ -184 +199 @@
                         this.connect(this, "onShow", "renderOnIdle");
                 },
+                
+                postMixInProperties: function(){
+                        this.inherited(arguments);
+                        var messages = dojo.mixin(dojo.i18n.getLocalization("dijit", "loading", this.lang),
+                                                                dojo.i18n.getLocalization("dojox.grid", "grid", this.lang));
+                        this.loadingMessage = dojo.string.substitute(this.loadingMessage, messages);
+                        this.errorMessage = dojo.string.substitute(this.errorMessage, messages);
+                        this.noDataMessage = dojo.string.substitute(this.noDataMessage, messages);
+                },
+                
                 postCreate: function(){
                         // replace stock styleChanged with one that triggers an update
@@ -421 +446 @@
                         return null;
                 },
+                
+                showMessage: function(message){
+                        if(message){
+                                this.messagesNode.innerHTML = message;
+                                this.messagesNode.style.display = "";
+                        }else{
+                                this.messagesNode.innerHTML = "";
+                                this.messagesNode.style.display = "none";
+                        }
+                },
 
                 _structureChanged: function() {
@@ -566 +601 @@
                         // views are position absolute, so they do not inflate the parent
                         if(this.autoHeight){
-                                this.viewsNode.style.height = this.views.measureContent() + 'px';
+                                var size = Math.max(this.views.measureContent(), dojo.marginBox(this.messagesNode).h) + 'px';
+                                this.viewsNode.style.height = size;
                         }
                 },