diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 8f76ff772..400d5554f 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -194,7 +194,7 @@ define([ '<% } %>'; var templateHugeCaption = - '' + - '', '<% } else if (split == false) {%>', '
', - '
', '<% } else { %>', '
', - '', - '', @@ -354,7 +355,8 @@ define([ caption : me.caption, style : me.style, dataHint : me.options.dataHint, - dataHintDirection: me.options.dataHintDirection + dataHintDirection: me.options.dataHintDirection, + dataHintOffset: me.options.dataHintOffset })); if (me.menu && _.isObject(me.menu) && _.isFunction(me.menu.render)) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 121f4570c..cd5a614ff 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -87,13 +87,15 @@ define([ valueField : 'value', search : false, scrollAlwaysVisible: false, - takeFocusOnClose: false + takeFocusOnClose: false, + dataHint: '', + dataHintDirection: '' }, template: _.template([ '', '', - '', '