Changeset 146057 in webkit

Timestamp:

Mar 18, 2013 5:52:47 AM (11 years ago)

Author:

eustas@chromium.org

Message:

Web Inspector: [Resources] Local Storage: duplicate keys are processed inappropriately.
​https://bugs.webkit.org/show_bug.cgi?id=112402

Reviewed by Alexander Pavlov.

When user creates new items or renames existing one some existing item
may be overriden. If value is changed, then frontend will receive
notification and update record appropriately.

If item value hasn't been changed, then no notification comes.
But UI still expect / rely on this notification.

With this patch the "no notification" scenario is fixed:
duplicate items are removed.

Another scenario is when update notification comes when we started
editing value (after entering / renaming key). In this case
selected node should not be changed to leave user in editing mode.

• inspector/front-end/DOMStorageItemsView.js:

Added workarounds for "no notification" and "useless notification".

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DOMStorageItemsView.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-18  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: [Resources] Local Storage: duplicate keys are processed inappropriately.
+        https://bugs.webkit.org/show_bug.cgi?id=112402
+
+        Reviewed by Alexander Pavlov.
+
+        When user creates new items or renames existing one some existing item
+        may be overriden. If value is changed, then frontend will receive
+        notification and update record appropriately.
+
+        If item value hasn't been changed, then no notification comes.
+        But UI still expect / rely on this notification.
+
+        With this patch the "no notification" scenario is fixed:
+        duplicate items are removed.
+
+        Another scenario is when update notification comes when we started
+        editing value (after entering / renaming key). In this case
+        selected node should not be changed to leave user in editing mode.
+
+        * inspector/front-end/DOMStorageItemsView.js:
+        Added workarounds for "no notification" and "useless notification".
+
 2013-03-18  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/inspector/front-end/DOMStorageItemsView.js

@@ -152 +152 @@
                 }
                 keyFound = true;
-                childNode.data.value = storageData.newValue;
-                childNode.refresh();
-                childNode.select();
-                childNode.reveal();
+                if (childNode.data.value !== storageData.newValue) {
+                    childNode.data.value = storageData.newValue;
+                    childNode.refresh();
+                    childNode.select();
+                    childNode.reveal();
+                }
                 this.deleteButton.visible = true;
             }
@@ -228 +230 @@
             if (oldText)
                 domStorage.removeItem(oldText);
-
             domStorage.setItem(newText, editingNode.data.value);
+            this._removeDupes(editingNode);
         } else
             domStorage.setItem(editingNode.data.key, newText);
     },
 
+    /**
+     * @param {!WebInspector.DataGridNode} masterNode
+     */
+    _removeDupes: function(masterNode)
+    {
+        var rootNode = this._dataGrid.rootNode();
+        var children = rootNode.children;
+        for (var i = children.length - 1; i >= 0; --i) {
+            var childNode = children[i];
+            if ((childNode.data.key === masterNode.data.key) && (masterNode !== childNode))
+                rootNode.removeChild(childNode);
+        }
+    },
+
     _deleteCallback: function(node)
     {