Changeset 47116 in webkit
- Timestamp:
- Aug 12, 2009 9:43:28 AM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r47115 r47116 1 2009-08-12 Joseph Pecoraro <joepeck02@gmail.com> 2 3 "Double-click to add" new style button does not always show up [quick fix] 4 https://bugs.webkit.org/show_bug.cgi?id=28187 5 6 * inspector/front-end/StylesSidebarPane.js: 7 (WebInspector.StylePropertyTreeElement.prototype.updateTitle): 8 1 9 2009-08-12 Crystal Zhang <crystal.zhang@torchmobile.com> 2 10 -
trunk/WebCore/inspector/front-end/StylesSidebarPane.js
r46848 r47116 897 897 // Advanced: rgba -> hsla -> nickname? -> ... 898 898 if (colors && colors.length === 1) { 899 var color = new WebInspector.Color(htmlValue); 900 swatch.addEventListener("click", changeColorDisplay, false); 901 swatch.addEventListener("dblclick", function(event) { 902 event.stopPropagation(); 903 }, false); 904 905 var mode = color.mode; 906 var valueElement = this.valueElement; 907 function changeColorDisplay(event) { 908 909 function changeTo(newMode, content) { 910 mode = newMode; 911 valueElement.textContent = content; 912 } 913 914 switch (mode) { 915 case "rgb": 916 changeTo("hsl", color.toHsl()); 917 break; 918 919 case "shorthex": 920 changeTo("hex", color.toHex()); 921 break; 922 923 case "hex": 924 changeTo("rgb", color.toRgb()); 925 break; 926 927 case "nickname": 928 if (color.simple) { 929 if (color.hasShortHex()) 899 try { 900 var color = new WebInspector.Color(htmlValue); 901 } catch(e) { 902 var color = null; 903 } 904 905 if (color) { 906 swatch.addEventListener("click", changeColorDisplay, false); 907 swatch.addEventListener("dblclick", function(event) { 908 event.stopPropagation(); 909 }, false); 910 911 var mode = color.mode; 912 var valueElement = this.valueElement; 913 function changeColorDisplay(event) { 914 915 function changeTo(newMode, content) { 916 mode = newMode; 917 valueElement.textContent = content; 918 } 919 920 switch (mode) { 921 case "rgb": 922 changeTo("hsl", color.toHsl()); 923 break; 924 925 case "shorthex": 926 changeTo("hex", color.toHex()); 927 break; 928 929 case "hex": 930 changeTo("rgb", color.toRgb()); 931 break; 932 933 case "nickname": 934 if (color.simple) { 935 if (color.hasShortHex()) 936 changeTo("shorthex", color.toShortHex()); 937 else 938 changeTo("hex", color.toHex()); 939 } else 940 changeTo("rgba", color.toRgba()); 941 break; 942 943 case "hsl": 944 if (color.nickname) 945 changeTo("nickname", color.toNickname()); 946 else if (color.hasShortHex()) 930 947 changeTo("shorthex", color.toShortHex()); 931 948 else 932 949 changeTo("hex", color.toHex()); 933 } else 934 changeTo("rgba", color.toRgba()); 935 break; 936 937 case "hsl": 938 if (color.nickname) 939 changeTo("nickname", color.toNickname()); 940 else if (color.hasShortHex()) 941 changeTo("shorthex", color.toShortHex()); 942 else 943 changeTo("hex", color.toHex()); 944 break; 945 946 case "rgba": 947 changeTo("hsla", color.toHsla()); 948 break; 949 950 case "hsla": 951 if (color.nickname) 952 changeTo("nickname", color.toNickname()); 953 else 954 changeTo("rgba", color.toRgba()); 955 break; 950 break; 951 952 case "rgba": 953 changeTo("hsla", color.toHsla()); 954 break; 955 956 case "hsla": 957 if (color.nickname) 958 changeTo("nickname", color.toNickname()); 959 else 960 changeTo("rgba", color.toRgba()); 961 break; 962 } 956 963 } 957 964 }
Note: See TracChangeset
for help on using the changeset viewer.