Changeset 27892 in webkit

Timestamp:

Nov 18, 2007, 3:01:03 PM (17 years ago)

Author:

timothy@apple.com

Message:

Reviewed by Brady.

Bug 16041: REGRESSION: the Database panel in the Inspector stopped showing errors
​http://bugs.webkit.org/show_bug.cgi?id=16041

• page/inspector/DatabasePanel.js: Implement error callbacks to pass to executeSql() and transaction(). Refactored some code for the success and error callbacks to use.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/DatabasePanel.js (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-18  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Brady.
+
+        Bug 16041: REGRESSION: the Database panel in the Inspector stopped showing errors
+        http://bugs.webkit.org/show_bug.cgi?id=16041
+
+        * page/inspector/DatabasePanel.js: Implement error callbacks to pass to executeSql()
+          and transaction(). Refactored some code for the success and error callbacks to use.
+
 2007-11-18  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/page/inspector/DatabasePanel.js

@@ -188 +188 @@
         this.resource.database.transaction(function(tx)
         {
-            tx.executeSql(query, [], function(tx, result) { panel.browseQueryFinished(result) }, function(tx,err){ alert(err.message); });
-        });
+            tx.executeSql(query, [], function(tx, result) { panel.browseQueryFinished(result) }, function(tx, error) { panel.browseQueryError(error) });
+        }, function(tx, error) { panel.browseQueryError(error) });
     },
 
@@ -197 +197 @@
 
         var table = this._tableForResult(result);
-        if (table) {
-            var rowCount = table.getElementsByTagName("tr").length;
-            var columnCount = table.getElementsByTagName("tr").item(0).getElementsByTagName("th").length;
-
-            var tr = document.createElement("tr");
-            tr.className = "database-result-filler-row";
-            table.appendChild(tr);
-
-            if (!(rowCount % 2))
-                tr.addStyleClass("alternate");
-
-            for (var i = 0; i < columnCount; ++i) {
-                var td = document.createElement("td");
-                tr.appendChild(td);
-            }
-
-            table.addStyleClass("database-browse-table");
-            this.views.browse.contentElement.appendChild(table);
-        } else {
-            if (!result.errorCode) {
-                var emptyMsgElement = document.createElement("div");
-                emptyMsgElement.className = "database-table-empty";
-                emptyMsgElement.textContent = WebInspector.UIString("The “%@”\ntable is empty.", this.currentTable);
-                this.views.browse.contentElement.appendChild(emptyMsgElement);
-            } else {
-                var errorMsgElement = document.createElement("div");
-                errorMsgElement.className = "database-table-error";
-                errorMsgElement.textContent = WebInspector.UIString("An error occurred trying to\nread the “%@” table.", this.currentTable);
-                this.views.browse.contentElement.appendChild(errorMsgElement);
-            }
-        }
+        if (!table) {
+            var emptyMsgElement = document.createElement("div");
+            emptyMsgElement.className = "database-table-empty";
+            emptyMsgElement.textContent = WebInspector.UIString("The “%@”\ntable is empty.", this.currentTable);
+            this.views.browse.contentElement.appendChild(emptyMsgElement);
+            return;
+        }
+
+        var rowCount = table.getElementsByTagName("tr").length;
+        var columnCount = table.getElementsByTagName("tr").item(0).getElementsByTagName("th").length;
+
+        var tr = document.createElement("tr");
+        tr.className = "database-result-filler-row";
+        table.appendChild(tr);
+
+        if (!(rowCount % 2))
+            tr.addStyleClass("alternate");
+
+        for (var i = 0; i < columnCount; ++i) {
+            var td = document.createElement("td");
+            tr.appendChild(td);
+        }
+
+        table.addStyleClass("database-browse-table");
+        this.views.browse.contentElement.appendChild(table);
+    },
+
+    browseQueryError: function(error)
+    {
+        this.views.browse.contentElement.removeChildren();
+
+        var errorMsgElement = document.createElement("div");
+        errorMsgElement.className = "database-table-error";
+        errorMsgElement.textContent = WebInspector.UIString("An error occurred trying to\nread the “%@” table.", this.currentTable);
+        this.views.browse.contentElement.appendChild(errorMsgElement);
     },
 
@@ -245 +249 @@
     },
 
-    queryFinished: function(query, result)
+    appendQueryResult: function(query, result, resultClassName)
     {
         var commandItem = document.createElement("li");
@@ -259 +263 @@
         commandItem.appendChild(resultDiv);
 
-        if (!result.errorCode) {
-            var table = this._tableForResult(result);
-            if (table)
-                resultDiv.appendChild(table);
-        } else {
-            if (this.currentView !== this.views.query)
-                this.currentView = this.views.query;
-
-            if (result.errorCode == 1) {
-                resultDiv.className += " error";
-                resultDiv.textContent = result.error;
-            } else if (result.errorCode == 2) {
-                resultDiv.className += " error";
-                resultDiv.textContent = WebInspector.UIString("Database no longer has expected version.");
-            } else {
-                resultDiv.className += " error";
-                resultDiv.textContent = WebInspector.UIString("An unexpected error %@ occured.", result.errorCode);
-            }
-        }
+        if (resultClassName)
+            resultDiv.addStyleClass(resultClassName);
+
+        if (typeof result === "string" || result instanceof String)
+            resultDiv.textContent = result;
+        else if (result && result.nodeName)
+            resultDiv.appendChild(result);
 
         this.views.query.commandListElement.appendChild(commandItem);
         commandItem.scrollIntoView(false);
+    },
+
+    queryFinished: function(query, result)
+    {
+        this.appendQueryResult(query, this._tableForResult(result));
+    },
+
+    queryError: function(query, error)
+    {
+        if (this.currentView !== this.views.query)
+            this.currentView = this.views.query;
+
+        if (error.code == 1)
+            var message = error.message;
+        else if (error.code == 2)
+            var message = WebInspector.UIString("Database no longer has expected version.");
+        else
+            var message = WebInspector.UIString("An unexpected error %@ occured.", error.code);
+
+        this.appendQueryResult(query, message, "error");
     },
 
@@ -295 +307 @@
         this.resource.database.transaction(function(tx) 
         {
-            tx.executeSql(query, [], function(tx, result) { panel.queryFinished(query, result) }, function(tx,err){ alert(err.message); });
-        });
+            tx.executeSql(query, [], function(tx, result) { panel.queryFinished(query, result) }, function(tx, error) { panel.queryError(query, error) });
+        }, function(tx, error) { panel.queryError(query, error) });
 
         this.queryPromptHistory.push(query);