Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 /** | 4 /** |
| 5 * @unrestricted | 5 * @unrestricted |
| 6 */ | 6 */ |
| 7 Elements.ClassesPaneWidget = class extends UI.Widget { | 7 Elements.ClassesPaneWidget = class extends UI.Widget { |
| 8 constructor() { | 8 constructor() { |
| 9 super(); | 9 super(); |
| 10 this.element.className = 'styles-element-classes-pane'; | 10 this.element.className = 'styles-element-classes-pane'; |
| 11 var container = this.element.createChild('div', 'title-container'); | 11 var container = this.element.createChild('div', 'title-container'); |
| 12 this._input = container.createChild('div', 'new-class-input monospace'); | 12 this._input = container.createChild('div', 'new-class-input monospace'); |
| 13 this.setDefaultFocusedElement(this._input); | 13 this.setDefaultFocusedElement(this._input); |
| 14 this._classesContainer = this.element.createChild('div', 'source-code'); | 14 this._classesContainer = this.element.createChild('div', 'source-code'); |
| 15 this._classesContainer.classList.add('styles-element-classes-container'); | 15 this._classesContainer.classList.add('styles-element-classes-container'); |
| 16 this._prompt = new Elements.ClassesPaneWidget.ClassNamePrompt(); | 16 this._prompt = new Elements.ClassesPaneWidget.ClassNamePrompt(); |
| 17 this._prompt.setAutocompletionTimeout(0); | 17 this._prompt.setAutocompletionTimeout(0); |
| 18 this._prompt.renderAsBlock(); | 18 this._prompt.renderAsBlock(); |
| 19 | 19 |
| 20 var proxyElement = this._prompt.attach(this._input); | 20 var proxyElement = this._prompt.attach(this._input); |
| 21 this._prompt.setPlaceholder(Common.UIString('Add new class')); | 21 this._prompt.setPlaceholder(Common.UIString('Add new class')); |
| 22 this._prompt.on(UI.TextPrompt.TextChangedEvent, this._onTextChanged, this); | |
| 22 proxyElement.addEventListener('keydown', this._onKeyDown.bind(this), false); | 23 proxyElement.addEventListener('keydown', this._onKeyDown.bind(this), false); |
| 23 | 24 |
| 24 SDK.targetManager.addModelListener(SDK.DOMModel, SDK.DOMModel.Events.DOMMuta ted, this._onDOMMutated, this); | 25 SDK.targetManager.addModelListener(SDK.DOMModel, SDK.DOMModel.Events.DOMMuta ted, this._onDOMMutated, this); |
| 25 /** @type {!Set<!SDK.DOMNode>} */ | 26 /** @type {!Set<!SDK.DOMNode>} */ |
| 26 this._mutatingNodes = new Set(); | 27 this._mutatingNodes = new Set(); |
| 27 UI.context.addFlavorChangeListener(SDK.DOMNode, this._update, this); | 28 this._updateNodeThrottler = new Common.Throttler(0); |
| 29 /** @type {?SDK.DOMNode} */ | |
| 30 this._previousTarget = null; | |
| 31 UI.context.addFlavorChangeListener(SDK.DOMNode, this._onFlavorChange, this); | |
| 32 } | |
| 33 | |
| 34 /** | |
| 35 * @param {string} text | |
| 36 * @return {!Array.<string>} | |
| 37 */ | |
| 38 _splitTextIntoClasses(text) { | |
| 39 return text.split(/[.,\s]/) | |
| 40 .map(className => className.trim()) | |
| 41 .filter(className => className.length); | |
| 28 } | 42 } |
| 29 | 43 |
| 30 /** | 44 /** |
| 31 * @param {!Event} event | 45 * @param {!Event} event |
| 32 */ | 46 */ |
| 33 _onKeyDown(event) { | 47 _onKeyDown(event) { |
| 48 if (!isEnterKey(event) && !isEscKey(event)) | |
| 49 return; | |
| 50 | |
| 34 var text = event.target.textContent; | 51 var text = event.target.textContent; |
| 35 if (isEscKey(event)) { | 52 if (isEscKey(event)) { |
| 36 event.target.textContent = ''; | |
| 37 if (!text.isWhitespace()) | 53 if (!text.isWhitespace()) |
| 38 event.consume(true); | 54 event.consume(true); |
| 39 return; | 55 text = ''; |
|
lushnikov
2017/03/17 17:41:19
i don't quite follow the logic here. The empty tex
kdzwinel
2017/03/20 09:51:13
Good catch! I've rearranged the code so that textC
| |
| 40 } | 56 } |
| 41 | 57 |
| 42 if (!isEnterKey(event)) | 58 if (isEnterKey(event)) |
| 43 return; | 59 event.consume(true); |
| 60 | |
| 44 var node = UI.context.flavor(SDK.DOMNode); | 61 var node = UI.context.flavor(SDK.DOMNode); |
| 45 if (!node) | 62 if (!node) |
| 46 return; | 63 return; |
| 47 | 64 |
| 48 this._prompt.clearAutocomplete(); | 65 this._prompt.clearAutocomplete(); |
| 49 event.target.textContent = ''; | 66 event.target.textContent = ''; |
| 50 var classNames = text.split(/[.,\s]/); | 67 var classNames = this._splitTextIntoClasses(text); |
| 51 for (var className of classNames) { | 68 for (var className of classNames) |
| 52 var className = className.trim(); | |
| 53 if (!className.length) | |
| 54 continue; | |
| 55 this._toggleClass(node, className, true); | 69 this._toggleClass(node, className, true); |
| 56 } | |
| 57 this._installNodeClasses(node); | 70 this._installNodeClasses(node); |
| 58 this._update(); | 71 this._update(); |
| 59 event.consume(true); | 72 } |
| 73 | |
| 74 _onTextChanged() { | |
| 75 var node = UI.context.flavor(SDK.DOMNode); | |
| 76 if (!node) | |
| 77 return; | |
| 78 var text = this._prompt.textWithCurrentSuggestion(); | |
| 79 var classes = this._splitTextIntoClasses(text); | |
| 80 | |
| 81 this._installNodeClasses(node, classes); | |
| 82 this._update(); | |
| 60 } | 83 } |
| 61 | 84 |
| 62 /** | 85 /** |
| 63 * @param {!Common.Event} event | 86 * @param {!Common.Event} event |
| 64 */ | 87 */ |
| 65 _onDOMMutated(event) { | 88 _onDOMMutated(event) { |
| 66 var node = /** @type {!SDK.DOMNode} */ (event.data); | 89 var node = /** @type {!SDK.DOMNode} */ (event.data); |
| 67 if (this._mutatingNodes.has(node)) | 90 if (this._mutatingNodes.has(node)) |
| 68 return; | 91 return; |
| 69 delete node[Elements.ClassesPaneWidget._classesSymbol]; | 92 delete node[Elements.ClassesPaneWidget._classesSymbol]; |
| 70 this._update(); | 93 this._update(); |
| 71 } | 94 } |
| 72 | 95 |
| 73 /** | 96 /** |
| 97 * @param {!Common.Event} event | |
| 98 */ | |
| 99 _onFlavorChange(event) { | |
| 100 if (this._previousTarget && this._prompt.text()) { | |
| 101 this._input.textContent = ''; | |
| 102 this._installNodeClasses(this._previousTarget); | |
|
lushnikov
2017/03/17 17:41:19
you probably want to flush throttler here to guara
kdzwinel
2017/03/20 09:51:12
Updated, PTAL if I read your comment correctly.
| |
| 103 } | |
| 104 this._previousTarget = /** @type {?SDK.DOMNode} */ (event.data); | |
| 105 this._update(); | |
| 106 } | |
| 107 | |
| 108 /** | |
| 74 * @override | 109 * @override |
| 75 */ | 110 */ |
| 76 wasShown() { | 111 wasShown() { |
| 77 this._update(); | 112 this._update(); |
| 78 } | 113 } |
| 79 | 114 |
| 80 _update() { | 115 _update() { |
| 81 if (!this.isShowing()) | 116 if (!this.isShowing()) |
| 82 return; | 117 return; |
| 83 | 118 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 * @param {string} className | 178 * @param {string} className |
| 144 * @param {boolean} enabled | 179 * @param {boolean} enabled |
| 145 */ | 180 */ |
| 146 _toggleClass(node, className, enabled) { | 181 _toggleClass(node, className, enabled) { |
| 147 var classes = this._nodeClasses(node); | 182 var classes = this._nodeClasses(node); |
| 148 classes.set(className, enabled); | 183 classes.set(className, enabled); |
| 149 } | 184 } |
| 150 | 185 |
| 151 /** | 186 /** |
| 152 * @param {!SDK.DOMNode} node | 187 * @param {!SDK.DOMNode} node |
| 188 * @param {!Array.<string>=} additionalClasses | |
| 153 */ | 189 */ |
| 154 _installNodeClasses(node) { | 190 _installNodeClasses(node, additionalClasses) { |
| 155 var classes = this._nodeClasses(node); | 191 var classes = this._nodeClasses(node); |
| 156 var activeClasses = new Set(); | 192 var activeClasses = new Set(); |
| 157 for (var className of classes.keys()) { | 193 for (var className of classes.keys()) { |
| 158 if (classes.get(className)) | 194 if (classes.get(className)) |
| 159 activeClasses.add(className); | 195 activeClasses.add(className); |
| 160 } | 196 } |
| 161 | 197 |
| 198 if (additionalClasses) { | |
| 199 for (className of additionalClasses) | |
| 200 activeClasses.add(className); | |
| 201 } | |
| 162 var newClasses = activeClasses.valuesArray(); | 202 var newClasses = activeClasses.valuesArray(); |
| 163 newClasses.sort(); | 203 newClasses.sort(); |
| 204 | |
| 205 this._updateNodeThrottler.schedule(this._setClassValue.bind(this, node, newC lasses.join(' '))); | |
| 206 } | |
| 207 | |
| 208 _setClassValue(node, value) { | |
|
lushnikov
2017/03/17 17:41:19
let's add jsdoc
| |
| 209 var fulfill; | |
| 210 var promise = new Promise(f => fulfill = f); | |
| 211 | |
| 164 this._mutatingNodes.add(node); | 212 this._mutatingNodes.add(node); |
| 165 node.setAttributeValue('class', newClasses.join(' '), onClassNameUpdated.bin d(this)); | 213 node.setAttributeValue('class', value, onClassValueUpdated.bind(this)); |
| 166 | 214 |
| 167 /** | 215 /** |
| 168 * @this {Elements.ClassesPaneWidget} | 216 * @this {Elements.ClassesPaneWidget} |
| 169 */ | 217 */ |
| 170 function onClassNameUpdated() { | 218 function onClassValueUpdated() { |
| 171 this._mutatingNodes.delete(node); | 219 this._mutatingNodes.delete(node); |
| 220 fulfill(); | |
| 172 } | 221 } |
| 222 | |
| 223 return promise; | |
| 173 } | 224 } |
| 174 }; | 225 }; |
| 175 | 226 |
| 176 Elements.ClassesPaneWidget._classesSymbol = Symbol('Elements.ClassesPaneWidget._ classesSymbol'); | 227 Elements.ClassesPaneWidget._classesSymbol = Symbol('Elements.ClassesPaneWidget._ classesSymbol'); |
| 177 | 228 |
| 178 /** | 229 /** |
| 179 * @implements {UI.ToolbarItem.Provider} | 230 * @implements {UI.ToolbarItem.Provider} |
| 180 * @unrestricted | 231 * @unrestricted |
| 181 */ | 232 */ |
| 182 Elements.ClassesPaneWidget.ButtonProvider = class { | 233 Elements.ClassesPaneWidget.ButtonProvider = class { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 255 if (!this._classNamesPromise || this._selectedFrameId !== selectedNode.frame Id()) | 306 if (!this._classNamesPromise || this._selectedFrameId !== selectedNode.frame Id()) |
| 256 this._classNamesPromise = this._getClassNames(selectedNode); | 307 this._classNamesPromise = this._getClassNames(selectedNode); |
| 257 | 308 |
| 258 return this._classNamesPromise.then(completions => { | 309 return this._classNamesPromise.then(completions => { |
| 259 if (prefix[0] === '.') | 310 if (prefix[0] === '.') |
| 260 completions = completions.map(value => '.' + value); | 311 completions = completions.map(value => '.' + value); |
| 261 return completions.filter(value => value.startsWith(prefix)).map(completio n => ({text: completion})); | 312 return completions.filter(value => value.startsWith(prefix)).map(completio n => ({text: completion})); |
| 262 }); | 313 }); |
| 263 } | 314 } |
| 264 }; | 315 }; |
| OLD | NEW |