Changeset 161674 in webkit
- Timestamp:
- Jan 10, 2014 2:06:15 PM (10 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r161673 r161674 1 2014-01-10 Timothy Hatcher <timothy@apple.com> 2 3 Fix an exception in WebInspector.Color. 4 5 https://bugs.webkit.org/show_bug.cgi?id=126765 6 7 Reviewed by Joseph Pecoraro. 8 9 * UserInterface/Color.js: 10 (WebInspector.Color.fromString): Check hasOwnPrperty before using the nickname color array. 11 (WebInspector.Color.prototype._toNicknameString): Ditto. 12 1 13 2014-01-10 Joseph Pecoraro <pecoraro@apple.com> 2 14 -
trunk/Source/WebInspectorUI/UserInterface/Color.js
r160483 r161674 94 94 } else if (match[3]) { // nickname 95 95 var nickname = match[3].toLowerCase(); 96 if ( nickname in WebInspector.Color.Nicknames) {96 if (WebInspector.Color.Nicknames.hasOwnProperty(nickname)) { 97 97 var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, WebInspector.Color.Nicknames[nickname].concat(1)); 98 98 color.nickname = nickname; … … 277 277 var nicknames = WebInspector.Color.Nicknames; 278 278 for (var nickname in nicknames) { 279 if (!nicknames.hasOwnProperty(nickname)) 280 continue; 281 279 282 var nicknameRGB = nicknames[nickname]; 280 283 if (nicknameRGB[0] === rgba[0] && nicknameRGB[1] === rgba[1] && nicknameRGB[2] === rgba[2])
Note: See TracChangeset
for help on using the changeset viewer.