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

Unified Diff: chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js

Issue 540183002: Add search to Print Preview advanced options and enable them in the UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js
diff --git a/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js b/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js
index 3633c0f908f9e708c06147130fa57df3c41c3679..ff83c6bcdcd0c0ef051a7b9a53d5cce3bd74153c 100644
--- a/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js
+++ b/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings_item.js
@@ -47,11 +47,17 @@ cr.define('print_preview', function() {
this.selectedValue_ = null;
/**
- * Active filter query text.
+ * Active filter query.
* @private {RegExp}
*/
this.query_ = null;
+ /**
+ * Search hint for the control.
+ * @private {print_preview.SearchBubble}
+ */
+ this.searchBubble_ = null;
+
/** @private {!EventTracker} */
this.tracker_ = new EventTracker();
};
@@ -64,19 +70,13 @@ cr.define('print_preview', function() {
this.setElementInternal(this.cloneTemplateInternal(
'advanced-settings-item-template'));
- var nameEl = this.getChildElement('.advanced-settings-item-label');
- var textContent = this.capability_.display_name;
- if (this.query_)
- this.addTextWithHighlight_(nameEl, textContent);
- else
- nameEl.textContent = textContent;
- nameEl.title = textContent;
-
this.tracker_.add(
this.select_, 'change', this.onSelectChange_.bind(this));
this.tracker_.add(this.text_, 'input', this.onTextInput_.bind(this));
this.initializeValue_();
+
+ this.renderCapability_();
},
/**
@@ -103,6 +103,12 @@ cr.define('print_preview', function() {
return !!this.selectedValue_;
},
+ /** @param {RegExp} query Query to update the filter with. */
+ updateSearchQuery: function(query) {
+ this.query_ = query;
+ this.renderCapability_();
+ },
+
/**
* @return {HTMLSelectElement} Select element.
* @private
@@ -142,6 +148,57 @@ cr.define('print_preview', function() {
},
/**
+ * Renders capability properties according to the current state.
+ * @private
+ */
+ renderCapability_: function() {
+ var textContent = this.capability_.display_name;
+ var nameMatches = this.query_ ? !!textContent.match(this.query_) : true;
+ var optionMatches = null;
+ if (false && this.query_) {
+ if (this.capability_.type == 'SELECT') {
+ this.capability_.select_cap.option.some(function(option) {
+ optionMatches = (option.display_name || '').match(this.query_);
+ return !!optionMatches;
+ }.bind(this));
+ } else {
+ optionMatches = (this.text_.value || '').match(this.query_);
+ }
+ }
+ var matches = nameMatches || optionMatches;
+
+ if ((!matches || !optionMatches) && this.searchBubble_) {
+ this.searchBubble_.dispose();
+ this.searchBubble_ = null;
+ }
+
+ setIsVisible(this.getElement(), matches);
+ if (!matches)
+ return;
+
+ var nameEl = this.getChildElement('.advanced-settings-item-label');
+ if (this.query_) {
+ nameEl.textContent = '';
+ this.addTextWithHighlight_(nameEl, textContent);
+ } else {
+ nameEl.textContent = textContent;
+ }
+ nameEl.title = textContent;
+
+ if (optionMatches) {
+ window.console.log(optionMatches[0]);
+ var element =
+ this.capability_.type == 'SELECT' ? this.select_ : this.text_;
+ if (!this.searchBubble_) {
+ this.searchBubble_ = new print_preview.SearchBubble(optionMatches[0]);
+ this.searchBubble_.attachTo(element);
+ } else {
+ this.searchBubble_.content = optionMatches[0];
+ }
+ }
+ },
+
+ /**
* Initializes the element's value control.
* @private
*/
« no previous file with comments | « chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698