Changeset 122104 in webkit

Timestamp:

Jul 9, 2012 5:33:48 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Add FileContentView for FileSystemView
​https://bugs.webkit.org/show_bug.cgi?id=90529

Adding FileContentView to Inspector.
This class provides preview of text files in FileSystem.

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-07-09
Reviewed by Vsevolod Vlasov.

• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• inspector/compile-front-end.py:
• inspector/front-end/FileContentView.js: Added.
• inspector/front-end/FileSystemView.js:

(WebInspector.FileSystemView.prototype.get visibleView):
(WebInspector.FileSystemView.EntryTreeElement.prototype.onselect):
(WebInspector.FileSystemView.EntryTreeElement.prototype._directoryContentReceived):
(WebInspector.FileSystemView.EntryTreeElement.prototype.refresh):

• inspector/front-end/WebKit.qrc:
• inspector/front-end/inspector.html:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• inspector/compile-front-end.py (modified) (1 diff)
• inspector/front-end/FileContentView.js (added)
• inspector/front-end/FileSystemView.js (modified) (4 diffs)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/inspector.html (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-09  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: Add FileContentView for FileSystemView
+        https://bugs.webkit.org/show_bug.cgi?id=90529
+
+        Adding FileContentView to Inspector.
+        This class provides preview of text files in FileSystem.
+
+        Reviewed by Vsevolod Vlasov.
+
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * inspector/compile-front-end.py:
+        * inspector/front-end/FileContentView.js: Added.
+        * inspector/front-end/FileSystemView.js:
+        (WebInspector.FileSystemView.prototype.get visibleView):
+        (WebInspector.FileSystemView.EntryTreeElement.prototype.onselect):
+        (WebInspector.FileSystemView.EntryTreeElement.prototype._directoryContentReceived):
+        (WebInspector.FileSystemView.EntryTreeElement.prototype.refresh):
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+
 2012-07-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -6280 +6280 @@
             'inspector/front-end/ExtensionServer.js',
             'inspector/front-end/FileManager.js',
+            'inspector/front-end/FileContentView.js',
             'inspector/front-end/FileSystemModel.js',
             'inspector/front-end/FileSystemView.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -74923 +74923 @@
                                 </File>
                                 <File
+                                        RelativePath="..\inspector\front-end\FileContentView.js"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\inspector\front-end\FileManager.js"
                                         >

trunk/Source/WebCore/inspector/compile-front-end.py

@@ -213 +213 @@
             "DirectoryContentView.js",
             "DOMStorageItemsView.js",
+            "FileContentView.js",
             "FileSystemView.js",
             "IndexedDBViews.js",

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

@@ -66 +66 @@
 
     /**
+     * @type {WebInspector.View}
+     */
+    get visibleView()
+    {
+        return this._visibleView;
+    },
+
+    /**
      * @param {WebInspector.View} view
      */
@@ -112 +120 @@
             if (this._entry.isDirectory)
                 this._view = new WebInspector.DirectoryContentView();
-            else
-                return;
+            else {
+                var file = /** @type {WebInspector.FileSystemModel.File} */ this._entry;
+                this._view = new WebInspector.FileContentView(file);
+            }
         }
         this._fileSystemView.showView(this._view);
@@ -158 +168 @@
                 if (oldChild._entry.isDirectory)
                     oldChild.shouldRefreshChildren = true;
+                else
+                    oldChild.refresh();
+
                 ++newEntryIndex;
                 ++oldChildIndex;
@@ -182 +195 @@
     refresh: function()
     {
-        if (!this._entry.isDirectory)
-            return;
-        this._entry.requestDirectoryContent(this._directoryContentReceived.bind(this));
+        if (!this._entry.isDirectory) {
+            if (this._view && this._view === this._fileSystemView.visibleView) {
+                var fileContentView = /** @type {WebInspector.FileContentView} */ this._view;
+                fileContentView.refresh();
+            }
+        } else
+            this._entry.requestDirectoryContent(this._directoryContentReceived.bind(this));
     }
 }

trunk/Source/WebCore/inspector/front-end/WebKit.qrc

@@ -58 +58 @@
     <file>ExtensionRegistryStub.js</file>
     <file>ExtensionServer.js</file>
+    <file>FileContentView.js</file>
     <file>FileManager.js</file>
     <file>FileSystemModel.js</file>

trunk/Source/WebCore/inspector/front-end/inspector.html

@@ -163 +163 @@
     <script type="text/javascript" src="SourceJavaScriptTokenizer.js"></script>
     <script type="text/javascript" src="DirectoryContentView.js"></script>
+    <script type="text/javascript" src="FileContentView.js"></script>
     <script type="text/javascript" src="FileSystemModel.js"></script>
     <script type="text/javascript" src="FileSystemView.js"></script>