Title: [210388] branches/safari-603-branch/Source/WebInspectorUI
- Revision
- 210388
- Author
- [email protected]
- Date
- 2017-01-05 15:49:31 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210311. rdar://problem/29871716
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebInspectorUI/ChangeLog (210387 => 210388)
--- branches/safari-603-branch/Source/WebInspectorUI/ChangeLog 2017-01-05 23:49:29 UTC (rev 210387)
+++ branches/safari-603-branch/Source/WebInspectorUI/ChangeLog 2017-01-05 23:49:31 UTC (rev 210388)
@@ -1,5 +1,24 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210311. rdar://problem/29871716
+
+ 2017-01-04 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: application cache details not shown in Storage Tab
+ https://bugs.webkit.org/show_bug.cgi?id=166699
+ <rdar://problem/29871716>
+
+ Reviewed by Brian Burg.
+
+ Fix a ternary operator precedence. The following _expression_ throws an exception:
+
+ true || false ? i.dont.exist : false
+
+ * UserInterface/Views/ApplicationCacheFrameTreeElement.js:
+ (WebInspector.ApplicationCacheFrameTreeElement.prototype.updateTitles):
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210252. rdar://problem/29854762
2017-01-03 Joseph Pecoraro <[email protected]>
Modified: branches/safari-603-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js (210387 => 210388)
--- branches/safari-603-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js 2017-01-05 23:49:29 UTC (rev 210387)
+++ branches/safari-603-branch/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js 2017-01-05 23:49:31 UTC (rev 210388)
@@ -56,7 +56,7 @@
currentAncestor = currentAncestor.parent;
}
- var subtitleIsDuplicate = subtitle === this._mainTitle || manifestTreeElement ? subtitle === manifestTreeElement.subtitle : false;
+ var subtitleIsDuplicate = subtitle === this._mainTitle || (manifestTreeElement && manifestTreeElement.subtitle === subtitle);
this.subtitle = subtitleIsDuplicate ? null : subtitle;
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
