<!doctype html>
<meta charset=utf-8>
<meta name=viewport content='width=device-width'>
<link rel="icon" type="image/x-icon" href="/favicon.ico">

<title> show.diff </title>

<link rel=stylesheet href=/lib/cm/cm.css>
<link rel=stylesheet href=/lib/css/ui.css>


<form id=toolbar name=export method=post target=_blank
  enctype=multipart/form-data>
  <a href='/'
     class="item crumb root-crumb"></a>
  <a href='/devtools/'
     class="item crumb ">devtools</a>
  <a href='/devtools/show.diff/'
     class="item crumb ">show.diff</a>
  <a class=item id=preview title=preview><img src=/lib/icons/eye_open.png></a>
  <a class=item id=validate title=validate><img src=/lib/icons/ok_2.png></a>
  <a class=item id=run title=run><img src=/lib/icons/play.png></a>
  <a class="item right" id=settings title=settings><img src=/lib/icons/settings.png></a>
  <select onchange=selectTheme(this) class="item right" id=theme
    title=theme>
   <option>default</option>
   <option>ambiance</option>
   <option>blackboard</option>
   <option>cobalt</option>
   <option>eclipse</option>
   <option>elegant</option>
   <option>erlang-dark</option>
   <option>lesser-dark</option>
   <option>monokai</option>
   <option>neat</option>
   <option>night</option>
   <option>rubyblue</option>
   <option>vibrant-ink</option>
   <option>xq-dark</option>
  </select>
  <a class="item right" id=download title=download download><img src=/lib/icons/download_alt.png></a>
  <a class="item right" id=dictate title=dictate><img src=/lib/icons/microphone.png></a>
  <a class="item right" id=sync-state title='sync state'><span></span><img src=/lib/img/offline.svg></a>
  <input type=hidden name=code>
  <input type=hidden name=file>
  <input type=hidden name=lang>
  <input type=hidden name=ucn_text>
  <input type=hidden name=ucn_text_mime>
  <input type=hidden name=ucn_task value=conformance>
  <input type=hidden name=run value=True>
</form>

<div id=wrapper class=panel></div>

<base target=_parent>

<script src=/lib/cm/cm.js></script>
<script src=/lib/js/canop/lib.js></script>
<script src=/lib/js/canop/cm.js></script>
<script src=/app/text/page.js></script>

<script>
  (function () {
    // UI elements
    var validate = document.querySelector('#validate');
    var preview = document.querySelector('#preview');
    var run = document.querySelector('#run');
    var download = document.querySelector('#download');
    var settings = document.querySelector('#settings');
    var wrapper = document.querySelector('#wrapper');
    var delay;

    // Update UI elements on content changes
    function onChange() {
      postMessage(cm.getValue(), '*');
    }

    function betterTab(cm) {
      if (cm.somethingSelected()) {
        cm.indentSelection('add');
      } else {
        cm.replaceSelection(cm.getOption("indentWithTabs")? "\t":
          Array(cm.getOption("indentUnit") + 1).join(" "), "end", "+input");
      }
    }
    function betterShiftTab(cm) { cm.indentSelection('subtract'); }

    var path = "/devtools/show.diff";
    var permission = "w";
    var mime = "text/x-diff" || 'text/plain';
    var username = undefined;
    var codeMirrorParams = {
      mode: mime,
      value: "Subversion Revision: 119462\ndiff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog\nindex f28a8cda61b7d3f52976646713dcf84cc3f953ad..6322e0232d45af706facbdc7e710480d8e007d89 100644\n--- a/Source/WebCore/ChangeLog\n+++ b/Source/WebCore/ChangeLog\n@@ -1,3 +1,24 @@\n+2012-06-06  Jan Keromnes  \u003cjanx@linux.com>\n+\n+        Web Inspector: Implement ExtensionPanel.show() method\n+        https://bugs.webkit.org/show_bug.cgi?id=88473\n+\n+        Implemented ExtensionPanel.show() API method to allow extension\n+        developers to show their panel when needed.\n+\n+        Reviewed by NOBODY (OOPS!).\n+\n+        Tests for this method are in:\n+        LayoutTests/inspector/extensions/extensions-panel.html\n+\n+        * inspector/front-end/ExtensionAPI.js:\n+        (defineCommonExtensionSymbols):\n+        (injectedExtensionAPI.ExtensionPanelImpl.prototype.createStatusBarButton):\n+        (injectedExtensionAPI.ExtensionPanelImpl.prototype.show):\n+        * inspector/front-end/ExtensionServer.js:\n+        (WebInspector.ExtensionServer):\n+        (WebInspector.ExtensionServer.prototype._onShowPanel):\n+\n 2012-06-04  Simon Fraser  \u003csimon.fraser@apple.com>\n \n         Leaking ClipRects\ndiff --git a/Source/WebCore/inspector/front-end/ExtensionAPI.js b/Source/WebCore/inspector/front-end/ExtensionAPI.js\nindex 882fb9c967d8e045f3f4462b6c319c7b209635ab..d169136946df6c9116c894f837b9c1cf35d1f792 100644\n--- a/Source/WebCore/inspector/front-end/ExtensionAPI.js\n+++ b/Source/WebCore/inspector/front-end/ExtensionAPI.js\n@@ -84,6 +84,7 @@ function defineCommonExtensionSymbols(apiPrivate)\n         SetSidebarContent: \"setSidebarContent\",\n         SetSidebarHeight: \"setSidebarHeight\",\n         SetSidebarPage: \"setSidebarPage\",\n+        ShowPanel: \"showPanel\",\n         StopAuditCategoryRun: \"stopAuditCategoryRun\",\n         Unsubscribe: \"unsubscribe\",\n         UpdateButton: \"updateButton\",\n@@ -100,6 +101,7 @@ defineCommonExtensionSymbols(apiPrivate);\n \n var commands = apiPrivate.Commands;\n var events = apiPrivate.Events;\n+var userAction = false;\n \n // Here and below, all constructors are private to API implementation.\n // For a public type Foo, if internal fields are present, these are on\n@@ -305,7 +307,13 @@ Panels.prototype = {\n         else {\n             function callbackWrapper(message)\n             {\n-                callback.call(null, new Resource(message.resource), message.lineNumber);\n+                // Allow the panel to show itself when handling the event.\n+                userAction = true;\n+                try {\n+                    callback.call(null, new Resource(message.resource), message.lineNumber);\n+                } finally {\n+                    userAction = false;\n+                }\n             }\n             extensionServer.registerHandler(events.OpenResource, callbackWrapper);\n         }\n@@ -394,6 +402,17 @@ ExtensionPanelImpl.prototype = {\n         };\n         extensionServer.sendRequest(request);\n         return new Button(id);\n+    },\n+\n+    show: function()\n+    {\n+        if (!userAction) return;\n+\n+        var request = {\n+            command: commands.ShowPanel,\n+            id: this._id\n+        };\n+        extensionServer.sendRequest(request);\n     }\n };\n \ndiff --git a/Source/WebCore/inspector/front-end/ExtensionServer.js b/Source/WebCore/inspector/front-end/ExtensionServer.js\nindex e67f8c6f5a1850329ed98427bf86614fc0780588..6140dcd0c4e84bdc0ba400913eb997e66a84dc44 100644\n--- a/Source/WebCore/inspector/front-end/ExtensionServer.js\n+++ b/Source/WebCore/inspector/front-end/ExtensionServer.js\n@@ -66,6 +66,7 @@ WebInspector.ExtensionServer = function()\n     this._registerHandler(commands.SetSidebarHeight, this._onSetSidebarHeight.bind(this));\n     this._registerHandler(commands.SetSidebarContent, this._onSetSidebarContent.bind(this));\n     this._registerHandler(commands.SetSidebarPage, this._onSetSidebarPage.bind(this));\n+    this._registerHandler(commands.ShowPanel, this._onShowPanel.bind(this));\n     this._registerHandler(commands.StopAuditCategoryRun, this._onStopAuditCategoryRun.bind(this));\n     this._registerHandler(commands.Subscribe, this._onSubscribe.bind(this));\n     this._registerHandler(commands.Unsubscribe, this._onUnsubscribe.bind(this));\n@@ -204,6 +205,12 @@ WebInspector.ExtensionServer.prototype = {\n         return this._status.OK();\n     },\n \n+    _onShowPanel: function(message)\n+    {\n+        // Note: WebInspector.showPanel already sanitizes input.\n+        WebInspector.showPanel(message.id);\n+    },\n+\n     _onCreateStatusBarButton: function(message, port)\n     {\n         var panel = this._clientObjects[message.panel];\ndiff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog\nindex ad707d0939393a6e7bfbb39a64da4558a22d33d5..9c694e7ab2a0e1360fdd5f72070bca9e4775ddf3 100644\n--- a/LayoutTests/ChangeLog\n+++ b/LayoutTests/ChangeLog\n@@ -1,3 +1,16 @@\n+2012-06-06  Jan Keromnes  \u003cjanx@linux.com>\n+\n+        Web Inspector: Implement ExtensionPanel.show() method\n+        https://bugs.webkit.org/show_bug.cgi?id=88473\n+\n+        Add output for ExtensionPanel callbacks, and use ExtensionPanel.show()\n+        to show the panel. Fix expected.\n+\n+        Reviewed by NOBODY (OOPS!).\n+\n+        * inspector/extensions/extensions-panel-expected.txt:\n+        * inspector/extensions/extensions-panel.html:\n+\n 2012-06-04  Emil A Eklund  \u003ceae@chromium.org>\n \n         Unreviewed chromium windows rebaseline for r119456.\ndiff --git a/LayoutTests/inspector/extensions/extensions-panel-expected.txt b/LayoutTests/inspector/extensions/extensions-panel-expected.txt\nindex 1720709efa09d2d705c9165ea1a4ccd7844a0332..73fb42e29db9154333a0e8066591c327de638d83 100644\n--- a/LayoutTests/inspector/extensions/extensions-panel-expected.txt\n+++ b/LayoutTests/inspector/extensions/extensions-panel-expected.txt\n@@ -18,8 +18,10 @@ Panel created\n         removeListener : \u003cfunction>\n     }\n     createStatusBarButton : \u003cfunction>\n+    show : \u003cfunction>\n }\n Extension panel size correct\n+Panel shown\n RUNNING TEST: extension_testStatusBarButtons\n Created a status bar button, dump follows:\n {\n@@ -29,6 +31,7 @@ Created a status bar button, dump follows:\n     }\n     update : \u003cfunction>\n }\n+Panel hidden\n button1 clicked\n Status bar buttons state:\n status bar item 0, icon: .../inspector/resources/button1.png, tooltip: 'Button One tooltip', disabled: false\ndiff --git a/LayoutTests/inspector/extensions/extensions-panel.html b/LayoutTests/inspector/extensions/extensions-panel.html\nindex 9019758de4fab5291022caa631f550f7e42bf9d1..0648e3b5c77b719455f453c4104bf20a0bb99797 100644\n--- a/LayoutTests/inspector/extensions/extensions-panel.html\n+++ b/LayoutTests/inspector/extensions/extensions-panel.html\n@@ -62,6 +62,14 @@ function extension_testCreatePanel(nextTest)\n     {\n         output(\"Panel created\");\n         dumpObject(panel);\n+\n+        panel.onHidden.addListener(function() {\n+            output(\"Panel hidden\");\n+        });\n+        panel.onShown.addListener(function(window) {\n+            output(\"Panel shown\");\n+        });\n+\n         // This will force extension iframe to be really loaded and will cause waitForPanel() callback below.\n         extension_showPanel(\"extension\");\n     }",
      autofocus: true,
      lineNumbers: true,
      lineWrapping: true,
      matchBrackets: true,
      autoCloseBrackets: '()[]{}""',
      continueComments: true,
      extraKeys: {
        Tab: betterTab,
        'Shift-Tab': betterShiftTab
      },
      readOnly: 'nocursor'  // It'll be writable when the connection is set up.
    };
    var extraCodeMirrorParams = undefined || {};
    Object.keys(extraCodeMirrorParams).forEach(function(key) {
      codeMirrorParams[key] = extraCodeMirrorParams[key];
    });

    // CodeMirror editor
    var cm = window.cm = CodeMirror(wrapper, codeMirrorParams);
    // Hack to make wrapped text indented.
    var charWidth = cm.defaultCharWidth();
    cm.on('renderLine', function(cm, line, elt) {
      var off = CodeMirror.countColumn(line.text, null, cm.getOption('tabSize'))
        * charWidth;
      var basePadding = 4;
      elt.style.textIndent = '-' + off + 'px';
      elt.style.paddingLeft = (basePadding + off) + 'px';
    });
    cm.refresh();
    cm.on('change', onChange);
    onChange();     // Send the initial value.

    // Operational Transformation
    var canopClient = new canop.Client();
    canop.wire.websocket(canopClient, {
      url: "ws" + window.location.protocol.slice(4) + "//" +
        window.location.host + window.location.pathname + "?op=edit&app=text",
    });
    canop.ui.codemirror(canopClient, cm);
    canopClient.once('ready', function() {
      if (/^[wx]$/.test(permission)) {
        cm.setOption('readOnly', false);
        canopClient.signal({name: username});
      }
    });
    var syncState = document.getElementById('sync-state');
    var syncImg = document.querySelector('#sync-state > img');
    var setSyncText = function() {
      if (canopClient.clientCount > 1) {
        syncState.title = canopClient.clientCount + ' users';
      } else if (canopClient.clientState === 0) {
        syncState.title = 'offline';
      } else if (canopClient.clientState === 1) {
        syncState.title = 'syncing';
      } else if (canopClient.clientState === 2) {
        syncState.title = 'synced';
      }
    };
    canopClient.on('synced', function() {
      syncImg.src = '/lib/img/synced.svg';
      setSyncText();
    });
    canopClient.on('syncing', function() {
      syncImg.src = '/lib/img/syncing.svg';
      setSyncText();
    });
    canopClient.on('unsyncable', function(e) {
      syncImg.src = '/lib/img/offline.svg';
      setSyncText();
      if (e && e.name === 'UnknownBaseError') {
        alert("We cannot merge your changes with the server. Please reload.");
      }
    });
    canopClient.on('signal', function() { setSyncText(); });

    // General button actions
    validate.target = run.target = download.target = settings.target = '_blank';
    download.href = path + '?app=data';
    settings.href = path + '?app=meta';

    // Mime type specific environments
    if (environment[mime]) environment[mime](path);

  })();

</script>

<!-- Google Analytics -->
<script>var _gaq=_gaq||[];_gaq.push(['_setAccount','UA-27876347-1']);_gaq.push(['_trackPageview']);(function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})()</script>
