fix: Initialize UI defaultIcons without initial selected menu option. (…

…nhn#127)
EveryMundo · Jul 2, 2020 · 2d739ef · 2d739ef
1 parent 01aab1d
commit 2d739ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/css/buttons.styl b/src/css/buttons.styl
@@ -5,6 +5,7 @@
  &.icon-location .{prefix}-button[data-icontype="icon-location"] svg > use.active,
  &.icon-polygon .{prefix}-button[data-icontype="icon-polygon"] svg > use.active,
  &.icon-star .{prefix}-button[data-icontype="icon-star"] svg > use.active,
+ &.icon-star-2 .{prefix}-button[data-icontype="icon-star-2"] svg > use.active,
  &.icon-arrow-3 .{prefix}-button[data-icontype="icon-arrow-3"] svg > use.active,
  &.icon-arrow-2 .{prefix}-button[data-icontype="icon-arrow-2"] svg > use.active,
  &.icon-arrow .{prefix}-button[data-icontype="icon-arrow"] svg > use.active,

diff --git a/src/js/ui.js b/src/js/ui.js
@@ -219,10 +219,10 @@ class Ui {
  /**
  * Change delete button status
  * @param {Object} [options] - Ui setting options
- * @param {number} option.loadImage - Init default load image
- * @param {number} option.initMenu - Init start menu
- * @param {Boolean} [option.menuBarPosition=bottom] - Let
- * @param {Boolean} [option.applyCropSelectionStyle=false] - Let
+ * @param {object} [option.loadImage] - Init default load image
+ * @param {string} [option.initMenu] - Init start menu
+ * @param {string} [option.menuBarPosition=bottom] - Let
+ * @param {boolean} [option.applyCropSelectionStyle=false] - Let
  * @returns {Object} initialize option
  * @private
  */
@@ -235,7 +235,7 @@ class Ui {
  locale: {},
  menuIconPath: '',
  menu: ['crop', 'flip', 'rotate', 'draw', 'shape', 'icon', 'text', 'mask', 'filter'],
- initMenu: false,
+ initMenu: '',
  uiSize: {
  width: '100%',
  height: '100%'
@@ -529,9 +529,10 @@ class Ui {
  const evt = document.createEvent('MouseEvents');
  evt.initEvent('click', true, false);
  this._els[this.options.initMenu].dispatchEvent(evt);
- if (this.icon) {
- this.icon.registDefaultIcon();
- }
+ }
+
+ if (this.icon) {
+ this.icon.registDefaultIcon();
  }
  }
 

diff --git a/src/js/ui/template/style.js b/src/js/ui/template/style.js
@@ -23,6 +23,7 @@ export default ({
  #tie-icon-add-button.icon-location .tui-image-editor-button[data-icontype="icon-location"] label,
  #tie-icon-add-button.icon-polygon .tui-image-editor-button[data-icontype="icon-polygon"] label,
  #tie-icon-add-button.icon-star .tui-image-editor-button[data-icontype="icon-star"] label,
+ #tie-icon-add-button.icon-star-2 .tui-image-editor-button[data-icontype="icon-star-2"] label,
  #tie-icon-add-button.icon-arrow-3 .tui-image-editor-button[data-icontype="icon-arrow-3"] label,
  #tie-icon-add-button.icon-arrow-2 .tui-image-editor-button[data-icontype="icon-arrow-2"] label,
  #tie-icon-add-button.icon-arrow .tui-image-editor-button[data-icontype="icon-arrow"] label,