17907 2008-03-17 21:02:18 -0700 Inspector should support Firebug's magic $0 variable to access inspected node 2009-07-24 01:31:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 14355 1 aroben webkit-unassigned abarth emacemac7 joepeck mjs rik timothy oldest_to_newest 74211 0 aroben 2008-03-17 21:02:18 -0700 Firebug has a magic $1 variable that's available from the Console to access the inspected node. We should support this variable in the Inspector's Console. 74213 1 timothy 2008-03-17 21:08:40 -0700 Thats a shame that Firebug uses $1. I was considering doing the gdb $n to refer to previous console results. More people might be familiar with Firebug's concept though. 82297 2 aroben 2008-06-04 08:29:09 -0700 *** Bug 19390 has been marked as a duplicate of this bug. *** 82425 3 rik 2008-06-06 08:33:25 -0700 $1 isn't available in Firebug 1.2b2. I don't know if it's a bug or if they abandoned it. By the way, I've asked other web developers, nobody knew this shortcut. Maybe you could agreed with Firebug developers on a more standard way to do this. 85794 4 aroben 2008-07-11 14:06:17 -0700 <rdar://problem/6070208> 88482 5 keishi 2008-08-14 09:19:12 -0700 According to this old documentation, I think $0 is the inspected node. http://www.joehewitt.com/software/firebug/docs.php 88483 6 22794 keishi 2008-08-14 09:23:28 -0700 Created attachment 22794 not working patch $0 seems to receive the appropriate object, but the security seems to block usage. For example, calling "$0" seems OK, but calling "$0.innerHTML" returns undefined. I tried doing wrapCallback on the node but that doesn't work either. 93560 7 mjs 2008-10-01 10:07:16 -0700 Maybe this could have a less obscure name, like console.selectedNode or something. With autocomplete the typing is not a big deal and it is more memorable and less likely to conflict than $0. 93562 8 aroben 2008-10-01 10:23:40 -0700 (In reply to comment #7) > Maybe this could have a less obscure name, like console.selectedNode or > something. Putting it on the console object may not be ideal, since it's unlikely we want web pages to have access to this variable. 133623 9 33221 keishi 2009-07-21 15:33:29 -0700 Created attachment 33221 Implements $0, $1, $n I've finally figured this out. JSInspectorCallbackWrapper wraps the return value with JSInspectorCallbackWrapper::wrapOutgoingValue. It wraps it as a JSInspectorCallbackWrapper, which blocks getProperty, setProperty, deleteProperty, construct, hasInstance, and getPropertyNames. I think this is overkill for objects from the "inspected window" but a necessary security measure for objects from the "inspector". $0 - Variable containing the most recently inspected object . $1 - Variable containing the next most recently inspected object . $n(n) - Returns the nth most recently inspected object that has been inspected. 133634 10 33223 keishi 2009-07-21 15:48:42 -0700 Created attachment 33223 set history limit to 5 The history limit seems to be 5 in firebug. 133658 11 33223 timothy 2009-07-21 16:59:23 -0700 Comment on attachment 33223 set history limit to 5 > + profileEnd: function() { return console.profileEnd.apply(console, arguments) }, \ > + _inspectedNodes: [], \ > + _addInspectedNode: function(node) { \ The indentation is one space off for _inspectedNodes. + var _inspectedNodes = _inspectorCommandLineAPI._inspectedNodes; \ The local variable should not have an underscore prefix. > + $n: function(n) { return _inspectorCommandLineAPI._inspectedNodes[n] } \ Firebug really adds a $n function? Not just $0, $1, $2, $3 and $4? 133674 12 joepeck 2009-07-21 18:07:31 -0700 > Firebug really adds a $n function? Not just $0, $1, $2, $3 and $4? Yah, documentation on this is rather hidden. Its at the bottom of Joe Hewitt's site: http://joehewitt.com/software/firebug/docs.php 133686 13 33237 keishi 2009-07-21 20:49:53 -0700 Created attachment 33237 Syntax fixes $n is pointless. It's only in their old outdated documentation anyway. (The assert* commands seems to have been deprecated) I vote to ditch it. 133687 14 timothy 2009-07-21 20:51:19 -0700 Lets ditch $n. 133689 15 33238 keishi 2009-07-21 21:00:17 -0700 Created attachment 33238 No more $n 134454 16 abarth 2009-07-24 01:31:41 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/Console.js M WebCore/inspector/front-end/ElementsPanel.js Committed r46338 M WebCore/ChangeLog M WebCore/inspector/front-end/ElementsPanel.js M WebCore/inspector/front-end/Console.js r46338 = 4e1d680f3088d0cdd0b49c04acba4a47421cc311 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46338 22794 2008-08-14 09:23:28 -0700 2009-07-21 15:33:29 -0700 not working patch patch8.txt text/plain 1347 keishi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNTc1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDgtMDgtMTQgIEtlaXNoaSBIYXR0b3JpICA8Y2FzZXkuaGF0dG9y aUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODczCisgICAg ICAgIEFkZHMgc3VwcG9ydCBmb3IgJDAgaW4gdGhlIEluc3BlY3RvciBjb21tYW5kIGxpbmUuCisK KyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzOgorCiAyMDA4LTA4LTEzICBTYW0g V2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENh cmxzb24uCkluZGV4OiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL0NvbnNvbGUuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9Db25zb2xlLmpzCShyZXZpc2lvbiAzNTc1MikK KysrIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvQ29uc29sZS5qcwkod29ya2luZyBjb3B5KQpAQCAt MzUyLDYgKzM1Miw4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICBwcm9maWxlOiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZS5h cHBseShjb25zb2xlLCBhcmd1bWVudHMpIH0sIFwKICAgICAgICAgICAgICAgICBwcm9maWxlRW5k OiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZUVuZC5hcHBseShjb25zb2xlLCBh cmd1bWVudHMpIH0gXAogICAgICAgICAgICAgfTsiKTsKKyAgICAgICAgICAgIHZhciBlbGVtZW50 c1BhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50czsKKyAgICAgICAgICAgIGluc3Bl Y3RlZFdpbmRvdy5faW5zcGVjdG9yQ29tbWFuZExpbmVBUEkuX19kZWZpbmVHZXR0ZXJfXygiJDAi LCBJbnNwZWN0b3JDb250cm9sbGVyLndyYXBDYWxsYmFjayhlbGVtZW50c1BhbmVsLl9fbG9va3Vw R2V0dGVyX18oImZvY3VzZWRET01Ob2RlIikuYmluZChlbGVtZW50c1BhbmVsKSkpOwogICAgICAg ICB9CiAKICAgICAgICAgZXhwcmVzc2lvbiA9ICJ3aXRoICh3aW5kb3cuX2luc3BlY3RvckNvbW1h bmRMaW5lQVBJKSB7ICIgKyBleHByZXNzaW9uICsgIiB9IjsK 33221 2009-07-21 15:33:29 -0700 2009-07-21 15:48:42 -0700 Implements $0, $1, $n patch0.diff text/plain 3211 keishi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTRjZDA2ZS4uMTU3NzRhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNy0yMSAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGRzIHN1cHBvcnQgZm9yIEZp cmVidWcncyBtYWdpYyAkMCB2YXJpYWJsZSB0byBhY2Nlc3MgaW5zcGVjdGVkIG5vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA3CisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZS5wcm90b3R5cGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKTogQWRk ZWQgX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLnsKKyAgICAgICAgICAgIF9pbnNwZWN0ZWROb2Rl cywgX2FkZEluc3BlY3RlZE5vZGUsICQwLCAkMSwgJG59CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWwudGhpcy50cmVlT3V0bGluZS5mb2N1c2VkTm9kZUNoYW5nZWQpOiBTdG9yZXMgdGhlIGlu c3BlY3RlZCBub2RlIGhpc3RvcnkKKyAgICAgICAgICAgIGluIF9pbnNwZWN0b3JDb21tYW5kTGlu ZUFQSS5faW5zcGVjdGVkTm9kZXMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs KToKKwogMjAwOS0wNy0yMSAgUHJpaXQgTGFlcyAgPHBsYWVzQHBsYWVzLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlLmpzCmluZGV4IDdmZmQwYWIuLjAzYjc4NDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlLmpzCkBAIC00MTIsNyArNDEyLDE3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xl LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXlzOiBmdW5jdGlvbihvKSB7IHZhciBh ID0gW107IGZvciAodmFyIGsgaW4gbykgYS5wdXNoKGspOyByZXR1cm4gYTsgfSwgXAogICAgICAg ICAgICAgICAgIHZhbHVlczogZnVuY3Rpb24obykgeyB2YXIgYSA9IFtdOyBmb3IgKHZhciBrIGlu IG8pIGEucHVzaChvW2tdKTsgcmV0dXJuIGE7IH0sIFwKICAgICAgICAgICAgICAgICBwcm9maWxl OiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZS5hcHBseShjb25zb2xlLCBhcmd1 bWVudHMpIH0sIFwKLSAgICAgICAgICAgICAgICBwcm9maWxlRW5kOiBmdW5jdGlvbigpIHsgcmV0 dXJuIGNvbnNvbGUucHJvZmlsZUVuZC5hcHBseShjb25zb2xlLCBhcmd1bWVudHMpIH0gXAorICAg ICAgICAgICAgICAgIHByb2ZpbGVFbmQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gY29uc29sZS5wcm9m aWxlRW5kLmFwcGx5KGNvbnNvbGUsIGFyZ3VtZW50cykgfSwgXAorICAgICAgICAgICAgICAgICBf aW5zcGVjdGVkTm9kZXM6IFtdLCBcCisgICAgICAgICAgICAgICAgX2FkZEluc3BlY3RlZE5vZGU6 IGZ1bmN0aW9uKG5vZGUpIHsgXAorICAgICAgICAgICAgICAgICAgICB2YXIgX2luc3BlY3RlZE5v ZGVzID0gX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLl9pbnNwZWN0ZWROb2RlczsgXAorICAgICAg ICAgICAgICAgICAgICBfaW5zcGVjdGVkTm9kZXMudW5zaGlmdChub2RlKTsgXAorICAgICAgICAg ICAgICAgICAgICBpZiAoX2luc3BlY3RlZE5vZGVzLmxlbmd0aCA+IDEwKSBcCisgICAgICAgICAg ICAgICAgICAgICAgICBfaW5zcGVjdGVkTm9kZXMucG9wKCk7IFwKKyAgICAgICAgICAgICAgICB9 LCBcCisgICAgICAgICAgICAgICAgZ2V0ICQwKCkgeyByZXR1cm4gX2luc3BlY3RvckNvbW1hbmRM aW5lQVBJLl9pbnNwZWN0ZWROb2Rlc1swXSB9LCBcCisgICAgICAgICAgICAgICAgZ2V0ICQxKCkg eyByZXR1cm4gX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLl9pbnNwZWN0ZWROb2Rlc1sxXSB9LCBc CisgICAgICAgICAgICAgICAgJG46IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21t YW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXNbbl0gfSBcCiAgICAgICAgICAgICB9OyIpOwogCiAg ICAgICAgICAgICBpbnNwZWN0ZWRXaW5kb3cuX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLmNsZWFy ID0gSW5zcGVjdG9yQ29udHJvbGxlci53cmFwQ2FsbGJhY2sodGhpcy5jbGVhck1lc3NhZ2VzLmJp bmQodGhpcykpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5q cwppbmRleCAzYzliZTU0Li40MjQ0NjczIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRWxlbWVudHNQYW5lbC5qcwpAQCAtNjAsNiArNjAsMTAgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRv Z2dsZU5vZGVTZWFyY2goKTsKICAgICAgICAgICAgIHRoaXMucGFuZWwubm9kZVNlYXJjaEJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIH0KKworICAgICAgICB2 YXIgaW5zcGVjdGVkV2luZG93ID0gSW5zcGVjdG9yQ29udHJvbGxlci5pbnNwZWN0ZWRXaW5kb3co KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5z dGFsbGVkKGluc3BlY3RlZFdpbmRvdyk7CisgICAgICAgIGluc3BlY3RlZFdpbmRvdy5faW5zcGVj dG9yQ29tbWFuZExpbmVBUEkuX2FkZEluc3BlY3RlZE5vZGUodGhpcy5fZm9jdXNlZERPTU5vZGUp OwogICAgIH07CiAKICAgICB0aGlzLmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMudHJl ZU91dGxpbmUuZWxlbWVudCk7Cg== 33223 2009-07-21 15:48:42 -0700 2009-07-21 20:49:53 -0700 set history limit to 5 patch0.diff text/plain 3219 keishi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTRjZDA2ZS4uMTU3NzRhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNy0yMSAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGRzIHN1cHBvcnQgZm9yIEZp cmVidWcncyBtYWdpYyAkMCB2YXJpYWJsZSB0byBhY2Nlc3MgaW5zcGVjdGVkIG5vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA3CisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZS5wcm90b3R5cGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKTogQWRk ZWQgX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLnsKKyAgICAgICAgICAgIF9pbnNwZWN0ZWROb2Rl cywgX2FkZEluc3BlY3RlZE5vZGUsICQwLCAkMSwgJG59CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWwudGhpcy50cmVlT3V0bGluZS5mb2N1c2VkTm9kZUNoYW5nZWQpOiBTdG9yZXMgdGhlIGlu c3BlY3RlZCBub2RlIGhpc3RvcnkKKyAgICAgICAgICAgIGluIF9pbnNwZWN0b3JDb21tYW5kTGlu ZUFQSS5faW5zcGVjdGVkTm9kZXMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs KToKKwogMjAwOS0wNy0yMSAgUHJpaXQgTGFlcyAgPHBsYWVzQHBsYWVzLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlLmpzCmluZGV4IDdmZmQwYWIuLjBkMGM5YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlLmpzCkBAIC00MTIsNyArNDEyLDE3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xl LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXlzOiBmdW5jdGlvbihvKSB7IHZhciBh ID0gW107IGZvciAodmFyIGsgaW4gbykgYS5wdXNoKGspOyByZXR1cm4gYTsgfSwgXAogICAgICAg ICAgICAgICAgIHZhbHVlczogZnVuY3Rpb24obykgeyB2YXIgYSA9IFtdOyBmb3IgKHZhciBrIGlu IG8pIGEucHVzaChvW2tdKTsgcmV0dXJuIGE7IH0sIFwKICAgICAgICAgICAgICAgICBwcm9maWxl OiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZS5hcHBseShjb25zb2xlLCBhcmd1 bWVudHMpIH0sIFwKLSAgICAgICAgICAgICAgICBwcm9maWxlRW5kOiBmdW5jdGlvbigpIHsgcmV0 dXJuIGNvbnNvbGUucHJvZmlsZUVuZC5hcHBseShjb25zb2xlLCBhcmd1bWVudHMpIH0gXAorICAg ICAgICAgICAgICAgIHByb2ZpbGVFbmQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gY29uc29sZS5wcm9m aWxlRW5kLmFwcGx5KGNvbnNvbGUsIGFyZ3VtZW50cykgfSwgXAorICAgICAgICAgICAgICAgICBf aW5zcGVjdGVkTm9kZXM6IFtdLCBcCisgICAgICAgICAgICAgICAgX2FkZEluc3BlY3RlZE5vZGU6 IGZ1bmN0aW9uKG5vZGUpIHsgXAorICAgICAgICAgICAgICAgICAgICB2YXIgX2luc3BlY3RlZE5v ZGVzID0gX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLl9pbnNwZWN0ZWROb2RlczsgXAorICAgICAg ICAgICAgICAgICAgICBfaW5zcGVjdGVkTm9kZXMudW5zaGlmdChub2RlKTsgXAorICAgICAgICAg ICAgICAgICAgICBpZiAoX2luc3BlY3RlZE5vZGVzLmxlbmd0aCA+PSA1KSBcCisgICAgICAgICAg ICAgICAgICAgICAgICBfaW5zcGVjdGVkTm9kZXMucG9wKCk7IFwKKyAgICAgICAgICAgICAgICB9 LCBcCisgICAgICAgICAgICAgICAgZ2V0ICQwKCkgeyByZXR1cm4gX2luc3BlY3RvckNvbW1hbmRM aW5lQVBJLl9pbnNwZWN0ZWROb2Rlc1swXSB9LCBcCisgICAgICAgICAgICAgICAgZ2V0ICQxKCkg eyByZXR1cm4gX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLl9pbnNwZWN0ZWROb2Rlc1sxXSB9LCBc CisgICAgICAgICAgICAgICAgJG46IGZ1bmN0aW9uKG4pIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21t YW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXNbbl0gfSBcCiAgICAgICAgICAgICB9OyIpOwogCiAg ICAgICAgICAgICBpbnNwZWN0ZWRXaW5kb3cuX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLmNsZWFy ID0gSW5zcGVjdG9yQ29udHJvbGxlci53cmFwQ2FsbGJhY2sodGhpcy5jbGVhck1lc3NhZ2VzLmJp bmQodGhpcykpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1l bnRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5q cwppbmRleCAzYzliZTU0Li40MjQ0NjczIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRWxlbWVudHNQYW5lbC5qcwpAQCAtNjAsNiArNjAsMTAgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgICAgICAgICBJbnNwZWN0b3JDb250cm9sbGVyLnRv Z2dsZU5vZGVTZWFyY2goKTsKICAgICAgICAgICAgIHRoaXMucGFuZWwubm9kZVNlYXJjaEJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7CiAgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIHZhciBpbnNwZWN0ZWRXaW5kb3cgPSBJbnNwZWN0b3JDb250cm9sbGVyLmluc3BlY3Rl ZFdpbmRvdygpOworICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5fZW5zdXJlQ29tbWFuZExp bmVBUElJbnN0YWxsZWQoaW5zcGVjdGVkV2luZG93KTsKKyAgICAgICAgaW5zcGVjdGVkV2luZG93 Ll9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5fYWRkSW5zcGVjdGVkTm9kZSh0aGlzLl9mb2N1c2Vk RE9NTm9kZSk7CiAgICAgfTsKIAogICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy50cmVlT3V0bGluZS5lbGVtZW50KTsK 33237 2009-07-21 20:49:53 -0700 2009-07-21 21:00:17 -0700 Syntax fixes patch0.diff text/plain 3214 keishi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTRjZDA2ZS4uMTU3NzRhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNy0yMSAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGRzIHN1cHBvcnQgZm9yIEZp cmVidWcncyBtYWdpYyAkMCB2YXJpYWJsZSB0byBhY2Nlc3MgaW5zcGVjdGVkIG5vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA3CisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZS5wcm90b3R5cGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKTogQWRk ZWQgX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLnsKKyAgICAgICAgICAgIF9pbnNwZWN0ZWROb2Rl cywgX2FkZEluc3BlY3RlZE5vZGUsICQwLCAkMSwgJG59CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWwudGhpcy50cmVlT3V0bGluZS5mb2N1c2VkTm9kZUNoYW5nZWQpOiBTdG9yZXMgdGhlIGlu c3BlY3RlZCBub2RlIGhpc3RvcnkKKyAgICAgICAgICAgIGluIF9pbnNwZWN0b3JDb21tYW5kTGlu ZUFQSS5faW5zcGVjdGVkTm9kZXMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs KToKKwogMjAwOS0wNy0yMSAgUHJpaXQgTGFlcyAgPHBsYWVzQHBsYWVzLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlLmpzCmluZGV4IDdmZmQwYWIuLmMwNjA0ZDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlLmpzCkBAIC00MTIsNyArNDEyLDE3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xl LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXlzOiBmdW5jdGlvbihvKSB7IHZhciBh ID0gW107IGZvciAodmFyIGsgaW4gbykgYS5wdXNoKGspOyByZXR1cm4gYTsgfSwgXAogICAgICAg ICAgICAgICAgIHZhbHVlczogZnVuY3Rpb24obykgeyB2YXIgYSA9IFtdOyBmb3IgKHZhciBrIGlu IG8pIGEucHVzaChvW2tdKTsgcmV0dXJuIGE7IH0sIFwKICAgICAgICAgICAgICAgICBwcm9maWxl OiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZS5hcHBseShjb25zb2xlLCBhcmd1 bWVudHMpIH0sIFwKLSAgICAgICAgICAgICAgICBwcm9maWxlRW5kOiBmdW5jdGlvbigpIHsgcmV0 dXJuIGNvbnNvbGUucHJvZmlsZUVuZC5hcHBseShjb25zb2xlLCBhcmd1bWVudHMpIH0gXAorICAg ICAgICAgICAgICAgIHByb2ZpbGVFbmQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gY29uc29sZS5wcm9m aWxlRW5kLmFwcGx5KGNvbnNvbGUsIGFyZ3VtZW50cykgfSwgXAorICAgICAgICAgICAgICAgIF9p bnNwZWN0ZWROb2RlczogW10sIFwKKyAgICAgICAgICAgICAgICBfYWRkSW5zcGVjdGVkTm9kZTog ZnVuY3Rpb24obm9kZSkgeyBcCisgICAgICAgICAgICAgICAgICAgIHZhciBpbnNwZWN0ZWROb2Rl cyA9IF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXM7IFwKKyAgICAgICAg ICAgICAgICAgICAgaW5zcGVjdGVkTm9kZXMudW5zaGlmdChub2RlKTsgXAorICAgICAgICAgICAg ICAgICAgICBpZiAoaW5zcGVjdGVkTm9kZXMubGVuZ3RoID49IDUpIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgIGluc3BlY3RlZE5vZGVzLnBvcCgpOyBcCisgICAgICAgICAgICAgICAgfSwgXAor ICAgICAgICAgICAgICAgIGdldCAkMCgpIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQ SS5faW5zcGVjdGVkTm9kZXNbMF0gfSwgXAorICAgICAgICAgICAgICAgIGdldCAkMSgpIHsgcmV0 dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXNbMV0gfSwgXAorICAg ICAgICAgICAgICAgICRuOiBmdW5jdGlvbihuKSB7IHJldHVybiBfaW5zcGVjdG9yQ29tbWFuZExp bmVBUEkuX2luc3BlY3RlZE5vZGVzW25dIH0gXAogICAgICAgICAgICAgfTsiKTsKIAogICAgICAg ICAgICAgaW5zcGVjdGVkV2luZG93Ll9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5jbGVhciA9IElu c3BlY3RvckNvbnRyb2xsZXIud3JhcENhbGxiYWNrKHRoaXMuY2xlYXJNZXNzYWdlcy5iaW5kKHRo aXMpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1Bh bmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5k ZXggM2M5YmU1NC4uNDI0NDY3MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Vs ZW1lbnRzUGFuZWwuanMKQEAgLTYwLDYgKzYwLDEwIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1Bh bmVsID0gZnVuY3Rpb24oKQogICAgICAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlci50b2dnbGVO b2RlU2VhcmNoKCk7CiAgICAgICAgICAgICB0aGlzLnBhbmVsLm5vZGVTZWFyY2hCdXR0b24ucmVt b3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwogICAgICAgICB9CisgICAgICAgIAorICAgICAg ICB2YXIgaW5zcGVjdGVkV2luZG93ID0gSW5zcGVjdG9yQ29udHJvbGxlci5pbnNwZWN0ZWRXaW5k b3coKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJ SW5zdGFsbGVkKGluc3BlY3RlZFdpbmRvdyk7CisgICAgICAgIGluc3BlY3RlZFdpbmRvdy5faW5z cGVjdG9yQ29tbWFuZExpbmVBUEkuX2FkZEluc3BlY3RlZE5vZGUodGhpcy5fZm9jdXNlZERPTU5v ZGUpOwogICAgIH07CiAKICAgICB0aGlzLmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu dHJlZU91dGxpbmUuZWxlbWVudCk7Cg== 33238 2009-07-21 21:00:17 -0700 2009-07-22 16:35:54 -0700 No more $n patch0.diff text/plain 3365 keishi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTRjZDA2ZS4uMTU3NzRhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wNy0yMSAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGRzIHN1cHBvcnQgZm9yIEZp cmVidWcncyBtYWdpYyAkMCB2YXJpYWJsZSB0byBhY2Nlc3MgaW5zcGVjdGVkIG5vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTA3CisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZS5wcm90b3R5cGUuX2Vuc3VyZUNvbW1hbmRMaW5lQVBJSW5zdGFsbGVkKTogQWRk ZWQgX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJLnsKKyAgICAgICAgICAgIF9pbnNwZWN0ZWROb2Rl cywgX2FkZEluc3BlY3RlZE5vZGUsICQwLCAkMSwgJG59CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRz UGFuZWwudGhpcy50cmVlT3V0bGluZS5mb2N1c2VkTm9kZUNoYW5nZWQpOiBTdG9yZXMgdGhlIGlu c3BlY3RlZCBub2RlIGhpc3RvcnkKKyAgICAgICAgICAgIGluIF9pbnNwZWN0b3JDb21tYW5kTGlu ZUFQSS5faW5zcGVjdGVkTm9kZXMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVs KToKKwogMjAwOS0wNy0yMSAgUHJpaXQgTGFlcyAgPHBsYWVzQHBsYWVzLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29uc29sZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlLmpzCmluZGV4IDdmZmQwYWIuLmVjNzlhOGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlLmpzCkBAIC00MTIsNyArNDEyLDE5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xl LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBrZXlzOiBmdW5jdGlvbihvKSB7IHZhciBh ID0gW107IGZvciAodmFyIGsgaW4gbykgYS5wdXNoKGspOyByZXR1cm4gYTsgfSwgXAogICAgICAg ICAgICAgICAgIHZhbHVlczogZnVuY3Rpb24obykgeyB2YXIgYSA9IFtdOyBmb3IgKHZhciBrIGlu IG8pIGEucHVzaChvW2tdKTsgcmV0dXJuIGE7IH0sIFwKICAgICAgICAgICAgICAgICBwcm9maWxl OiBmdW5jdGlvbigpIHsgcmV0dXJuIGNvbnNvbGUucHJvZmlsZS5hcHBseShjb25zb2xlLCBhcmd1 bWVudHMpIH0sIFwKLSAgICAgICAgICAgICAgICBwcm9maWxlRW5kOiBmdW5jdGlvbigpIHsgcmV0 dXJuIGNvbnNvbGUucHJvZmlsZUVuZC5hcHBseShjb25zb2xlLCBhcmd1bWVudHMpIH0gXAorICAg ICAgICAgICAgICAgIHByb2ZpbGVFbmQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gY29uc29sZS5wcm9m aWxlRW5kLmFwcGx5KGNvbnNvbGUsIGFyZ3VtZW50cykgfSwgXAorICAgICAgICAgICAgICAgIF9p bnNwZWN0ZWROb2RlczogW10sIFwKKyAgICAgICAgICAgICAgICBfYWRkSW5zcGVjdGVkTm9kZTog ZnVuY3Rpb24obm9kZSkgeyBcCisgICAgICAgICAgICAgICAgICAgIHZhciBpbnNwZWN0ZWROb2Rl cyA9IF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXM7IFwKKyAgICAgICAg ICAgICAgICAgICAgaW5zcGVjdGVkTm9kZXMudW5zaGlmdChub2RlKTsgXAorICAgICAgICAgICAg ICAgICAgICBpZiAoaW5zcGVjdGVkTm9kZXMubGVuZ3RoID49IDUpIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgIGluc3BlY3RlZE5vZGVzLnBvcCgpOyBcCisgICAgICAgICAgICAgICAgfSwgXAor ICAgICAgICAgICAgICAgIGdldCAkMCgpIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQ SS5faW5zcGVjdGVkTm9kZXNbMF0gfSwgXAorICAgICAgICAgICAgICAgIGdldCAkMSgpIHsgcmV0 dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXNbMV0gfSwgXAorICAg ICAgICAgICAgICAgIGdldCAkMigpIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5f aW5zcGVjdGVkTm9kZXNbMl0gfSwgXAorICAgICAgICAgICAgICAgIGdldCAkMygpIHsgcmV0dXJu IF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5zcGVjdGVkTm9kZXNbM10gfSwgXAorICAgICAg ICAgICAgICAgIGdldCAkNCgpIHsgcmV0dXJuIF9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5faW5z cGVjdGVkTm9kZXNbNF0gfQogICAgICAgICAgICAgfTsiKTsKIAogICAgICAgICAgICAgaW5zcGVj dGVkV2luZG93Ll9pbnNwZWN0b3JDb21tYW5kTGluZUFQSS5jbGVhciA9IEluc3BlY3RvckNvbnRy b2xsZXIud3JhcENhbGxiYWNrKHRoaXMuY2xlYXJNZXNzYWdlcy5iaW5kKHRoaXMpKTsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggM2M5YmU1NC4u NzM1NTA1ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRz UGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMKQEAgLTYwLDYgKzYwLDEwIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsID0gZnVuY3Rp b24oKQogICAgICAgICAgICAgSW5zcGVjdG9yQ29udHJvbGxlci50b2dnbGVOb2RlU2VhcmNoKCk7 CiAgICAgICAgICAgICB0aGlzLnBhbmVsLm5vZGVTZWFyY2hCdXR0b24ucmVtb3ZlU3R5bGVDbGFz cygidG9nZ2xlZC1vbiIpOwogICAgICAgICB9CisKKyAgICAgICAgdmFyIGluc3BlY3RlZFdpbmRv dyA9IEluc3BlY3RvckNvbnRyb2xsZXIuaW5zcGVjdGVkV2luZG93KCk7CisgICAgICAgIFdlYklu c3BlY3Rvci5jb25zb2xlLl9lbnN1cmVDb21tYW5kTGluZUFQSUluc3RhbGxlZChpbnNwZWN0ZWRX aW5kb3cpOworICAgICAgICBpbnNwZWN0ZWRXaW5kb3cuX2luc3BlY3RvckNvbW1hbmRMaW5lQVBJ Ll9hZGRJbnNwZWN0ZWROb2RlKHRoaXMuX2ZvY3VzZWRET01Ob2RlKTsKICAgICB9OwogCiAgICAg dGhpcy5jb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnRyZWVPdXRsaW5lLmVsZW1lbnQp Owo=