Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: Source/WebCore/inspector/front-end/StylesSidebarPane.js

Issue 12035003: Merge 139994 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Joseph Pecoraro 3 * Copyright (C) 2009 Joseph Pecoraro
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 var colorSwatch = new WebInspector.ColorSwatch(); 1754 var colorSwatch = new WebInspector.ColorSwatch();
1755 colorSwatch.setColorString(text); 1755 colorSwatch.setColorString(text);
1756 colorSwatch.element.addEventListener("click", swatchClick, false ); 1756 colorSwatch.element.addEventListener("click", swatchClick, false );
1757 1757
1758 var scrollerElement = hasSpectrum ? self._parentPane._computedSt ylePane.element.parentElement : null; 1758 var scrollerElement = hasSpectrum ? self._parentPane._computedSt ylePane.element.parentElement : null;
1759 1759
1760 function spectrumChanged(e) 1760 function spectrumChanged(e)
1761 { 1761 {
1762 color = e.data; 1762 color = e.data;
1763 var colorString = color.toString(); 1763 var colorString = color.toString();
1764 spectrum.displayText = colorString;
1764 colorValueElement.textContent = colorString; 1765 colorValueElement.textContent = colorString;
1765 colorSwatch.setColorString(colorString); 1766 colorSwatch.setColorString(colorString);
1766 self.applyStyleText(nameElement.textContent + ": " + valueEl ement.textContent, false, false, false); 1767 self.applyStyleText(nameElement.textContent + ": " + valueEl ement.textContent, false, false, false);
1767 } 1768 }
1768 1769
1769 function spectrumHidden(event) 1770 function spectrumHidden(event)
1770 { 1771 {
1771 scrollerElement.removeEventListener("scroll", repositionSpec trum, false); 1772 scrollerElement.removeEventListener("scroll", repositionSpec trum, false);
1772 var commitEdit = event.data; 1773 var commitEdit = event.data;
1773 var propertyText = !commitEdit && self.originalPropertyText ? self.originalPropertyText : (nameElement.textContent + ": " + valueElement.tex tContent); 1774 var propertyText = !commitEdit && self.originalPropertyText ? self.originalPropertyText : (nameElement.textContent + ": " + valueElement.tex tContent);
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
2577 if (!prefix && !force) 2578 if (!prefix && !force)
2578 return; 2579 return;
2579 2580
2580 var results = this._cssCompletions.startsWith(prefix); 2581 var results = this._cssCompletions.startsWith(prefix);
2581 var selectedIndex = this._cssCompletions.mostUsedOf(results); 2582 var selectedIndex = this._cssCompletions.mostUsedOf(results);
2582 completionsReadyCallback(results, selectedIndex); 2583 completionsReadyCallback(results, selectedIndex);
2583 }, 2584 },
2584 2585
2585 __proto__: WebInspector.TextPrompt.prototype 2586 __proto__: WebInspector.TextPrompt.prototype
2586 } 2587 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698