Skip to content

Commit

Permalink
Merge r174019 - Web Inspector: Type Token View shows type information…
Browse files Browse the repository at this point in the history
… on hover when it shouldn't

https://bugs.webkit.org/show_bug.cgi?id=137152

Reviewed by Brian J. Burg.

TypeTokenView should only show type information when there is
more than one primitive type or more than zero objects types.
This fixes a bug in checking the length of object types.

* UserInterface/Views/TypeTokenView.js:
(WebInspector.TypeTokenView.prototype._shouldShowPopover):

Canonical link: https://commits.webkit.org/154760.57@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174444 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
saambarati authored and carlosgcampos committed Oct 8, 2014
1 parent 38ed836 commit bdbb8fa
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
14 changes: 14 additions & 0 deletions Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,17 @@
2014-09-26 Saam Barati <saambarati1@gmail.com>

Web Inspector: Type Token View shows type information on hover when it shouldn't
https://bugs.webkit.org/show_bug.cgi?id=137152

Reviewed by Brian J. Burg.

TypeTokenView should only show type information when there is
more than one primitive type or more than zero objects types.
This fixes a bug in checking the length of object types.

* UserInterface/Views/TypeTokenView.js:
(WebInspector.TypeTokenView.prototype._shouldShowPopover):

2014-09-25 Saam Barati <saambarati1@gmail.com>

Web Inspector: console.assert(bitString) TypeSet:50
Expand Down
2 changes: 1 addition & 1 deletion Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js
Expand Up @@ -132,7 +132,7 @@ WebInspector.TypeTokenView.prototype = {
if (this._types.primitiveTypeNames && this._types.primitiveTypeNames.length > 1)
return true;

if (this._types.structures && this._types.structures)
if (this._types.structures && this._types.structures.length)
return true;

return false;
Expand Down

0 comments on commit bdbb8fa

Please sign in to comment.