fixed rebase issues for menu and hint
diff --git a/dev/js/src/menu/item.js b/dev/js/src/menu/item.js
index 873d81b..3f955be 100644
--- a/dev/js/src/menu/item.js
+++ b/dev/js/src/menu/item.js
@@ -218,8 +218,9 @@
// Initialize menu item
_init : function (params) {
- if (params[0] === undefined)
+ if (params[0] === undefined) {
throw new Error("Missing parameters");
+ };
this.content(params[0]);
diff --git a/dev/js/src/selectMenu.js b/dev/js/src/selectMenu.js
index 9ef6986..3e5c605 100644
--- a/dev/js/src/selectMenu.js
+++ b/dev/js/src/selectMenu.js
@@ -1,6 +1,6 @@
define(
- ['menu', 'selectMenu/item', 'menu/prefix', 'menu/lengthField'],
- function (menuClass, selectMenuItemClass, prefixClass, lengthFieldClass) {
+ ['menu', 'selectMenu/item'],
+ function (menuClass, selectMenuItemClass) {
return {
create : function (element) {
@@ -27,7 +27,9 @@
// Create object with list
var obj = Object.create(menuClass).upgradeTo(this)
- ._init(selectMenuItemClass, prefixClass, lengthFieldClass, list);
+ ._init(list, {
+ itemClass : selectMenuItemClass
+ });
obj._container = element;
obj._select = select;