| Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/dragbutton.js
|
| diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/dragbutton.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/dragbutton.js
|
| index 1e0e7e94c0dc538d51918e05c51acae4dff0df75..9c3b1a9938e9b5d62fac90be3f0ca91ee40a6a85 100644
|
| --- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/dragbutton.js
|
| +++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/dragbutton.js
|
| @@ -13,11 +13,19 @@
|
| //
|
| goog.provide('i18n.input.chrome.inputview.elements.content.DragButton');
|
|
|
| +goog.require('goog.a11y.aria');
|
| goog.require('goog.a11y.aria.State');
|
| +goog.require('goog.dom');
|
| +goog.require('goog.dom.TagName');
|
| +goog.require('goog.dom.classlist');
|
| +goog.require('goog.style');
|
| goog.require('i18n.input.chrome.FloatingWindowDragger');
|
| -goog.require('i18n.input.chrome.inputview.elements.content.FloatingVKButton');
|
| +goog.require('i18n.input.chrome.inputview.Css');
|
| +goog.require('i18n.input.chrome.inputview.elements.Element');
|
| +
|
|
|
| goog.scope(function() {
|
| +var Css = i18n.input.chrome.inputview.Css;
|
|
|
|
|
|
|
| @@ -25,21 +33,29 @@ goog.scope(function() {
|
| * The drag button.
|
| *
|
| * @param {string} id The id.
|
| - * @param {!i18n.input.chrome.inputview.elements.ElementType} type The element
|
| + * @param {!i18n.input.chrome.ElementType} type The element
|
| * type.
|
| * @param {string} iconCssClass The css class for the icon.
|
| * @param {goog.events.EventTarget=} opt_eventTarget The event target.
|
| * @constructor
|
| - * @extends {i18n.input.chrome.inputview.elements.content.FloatingVKButton}
|
| + * @extends {i18n.input.chrome.inputview.elements.Element}
|
| */
|
| i18n.input.chrome.inputview.elements.content.DragButton = function(id, type,
|
| iconCssClass, opt_eventTarget) {
|
| - goog.base(this, id, type, iconCssClass, opt_eventTarget);
|
| + i18n.input.chrome.inputview.elements.content.DragButton.base(this,
|
| + 'constructor', id, type, opt_eventTarget);
|
| +
|
| + /**
|
| + * The css class for the icon.
|
| + *
|
| + * @private {string}
|
| + */
|
| + this.iconCssClass_ = iconCssClass;
|
|
|
| this.pointerConfig.stopEventPropagation = false;
|
| };
|
| goog.inherits(i18n.input.chrome.inputview.elements.content.DragButton,
|
| - i18n.input.chrome.inputview.elements.content.FloatingVKButton);
|
| + i18n.input.chrome.inputview.elements.Element);
|
| var DragButton = i18n.input.chrome.inputview.elements.content.DragButton;
|
|
|
|
|
| @@ -47,11 +63,25 @@ var DragButton = i18n.input.chrome.inputview.elements.content.DragButton;
|
| DragButton.prototype.dragger_;
|
|
|
|
|
| +/** @private {!Element} */
|
| +DragButton.prototype.iconCell_;
|
| +
|
| +
|
| /** @override */
|
| DragButton.prototype.createDom = function() {
|
| - goog.base(this, 'createDom');
|
| - var ariaLabel = chrome.i18n.getMessage('DRAG_BUTTON');
|
| + DragButton.base(this, 'createDom');
|
| var elem = this.getElement();
|
| + var dom = goog.dom.getDomHelper();
|
| + goog.dom.classlist.addAll(elem, [Css.CANDIDATE_INTER_CONTAINER,
|
| + Css.TOOLBAR_BUTTON, Css.FLOAT_LEFT]);
|
| + this.iconCell_ = dom.createDom(goog.dom.TagName.DIV, Css.TABLE_CELL);
|
| + dom.appendChild(elem, this.iconCell_);
|
| +
|
| + var iconElem = dom.createDom(goog.dom.TagName.DIV, Css.INLINE_DIV);
|
| + goog.dom.classlist.add(iconElem, this.iconCssClass_);
|
| + dom.appendChild(this.iconCell_, iconElem);
|
| +
|
| + var ariaLabel = chrome.i18n.getMessage('DRAG_BUTTON');
|
| goog.a11y.aria.setState(/** @type {!Element} */ (elem),
|
| goog.a11y.aria.State.LABEL, ariaLabel);
|
| };
|
| @@ -59,10 +89,17 @@ DragButton.prototype.createDom = function() {
|
|
|
| /** @override */
|
| DragButton.prototype.enterDocument = function() {
|
| - goog.base(this, 'enterDocument');
|
| + DragButton.base(this, 'enterDocument');
|
| this.dragger_ = new i18n.input.chrome.FloatingWindowDragger(window,
|
| this.getElement());
|
| };
|
|
|
|
|
| -});
|
| +/** @override */
|
| +DragButton.prototype.resize = function(width, height) {
|
| + goog.style.setSize(this.iconCell_, width, height);
|
| + DragButton.base(this, 'resize', width, height);
|
| +};
|
| +
|
| +
|
| +}); // goog.scope
|
|
|