调整缩略图模式className

huang-qing · Feb 22, 2017 · 8fe169c · 8fe169c
1 parent 6974cda
commit 8fe169c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -133,5 +133,17 @@ $('#menubar').menubar('destroy');
 $('#menubar').menubar('layout');
 ~~~
 
+###开发
+
+创建build
+~~~
+gulp build
+~~~
+
+开发环境
+~~~
+gulp develop
+~~~
+
 
 
diff --git a/debug.log b/debug.log
@@ -1,2 +1,4 @@
 [0113/155920:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004
 [0113/155920:ERROR:node_debugger.cc(86)] Cannot start debugger server
+[0222/142527:ERROR:tcp_listen_socket.cc(76)] Could not bind socket to 127.0.0.1:6004
+[0222/142527:ERROR:node_debugger.cc(86)] Cannot start debugger server
diff --git a/dist/jquery.menubar/js/jquery.menubar.js b/dist/jquery.menubar/js/jquery.menubar.js
@@ -6,7 +6,8 @@
             style = item.style,
             arrows = item.children && item.children.length > 0,
             iconUrl = item.icon.url || '',
-            iconClass = !iconUrl ? item.icon.class || '' : '',
+            // ie8 class为关键字
+            iconClass = !iconUrl ? item.icon['class'] || '' : '',
             template;
 
         template = ['<a href="#" class="menubar-item ',
@@ -39,7 +40,7 @@
         var text = item.text,
             arrows = item.children && item.children.length > 0,
             iconUrl = item.icon.url || '',
-            iconClass = !iconUrl ? item.icon.class || '' : '',
+            iconClass = !iconUrl ? item.icon['class'] || '' : '',
             template;
 
         template = ['<p href="#" class="menubar-panel-title',
@@ -165,7 +166,7 @@
         panelPopup.find('.menubar-item-arrows').addClass('menubar-item-arrows-panel-group-popup');
         // 弹出显示
         panelGroupElemOffset = panelGroupElem.offset();
-        panelPopup.find('.menubar-panel-group.thumbnail').removeClass('thumbnail');
+        panelPopup.find('.menubar-panel-group.menubar-panel-group-thumbnail').removeClass('menubar-panel-group-thumbnail');
         // 存储相关信息
         itemsInPanelGroupPopup.push({
             popup: panelPopup,
@@ -398,10 +399,10 @@
         menubarElem.find('.menubar-panel-group').each(function (i) {
             var panelGroupElem = $(this),
                 panelGroup = panelGroups[i],
-                className = panelGroup.state;
+                className = panelGroup.state === 'thumbnail' ? 'menubar-panel-group-thumbnail' : 'normal';
 
             if (!panelGroupElem.hasClass(className)) {
-                panelGroupElem.removeClass('normal').removeClass('thumbnail').addClass(className);
+                panelGroupElem.removeClass('normal').removeClass('menubar-panel-group-thumbnail').addClass(className);
             }
         });
     }
@@ -432,7 +433,7 @@
             value: '',
             icon: {
                 url: '',
-                class: ''
+                'class': ''
             },
             other: {},
             // big small
@@ -474,7 +475,7 @@
             panelGroupElem;
 
         // 点击菜单面板缩略图模式，弹出面板
-        if (regTitleInPanel.test(targetClassName) && (panelGroupElem = target.closest('.thumbnail')) && panelGroupElem.length === 1) {
+        if (regTitleInPanel.test(targetClassName) && (panelGroupElem = target.closest('.menubar-panel-group-thumbnail')) && panelGroupElem.length === 1) {
             // 创建一个菜单面板当前所在分组的副本
             menubarElem = panelGroupElem.closest('.menubar');
             menuId = menubarElem.attr('data-menuId');

diff --git a/dist/jquery.menubar/sass/jquery.menubar.css b/dist/jquery.menubar/sass/jquery.menubar.css
diff --git a/dist/jquery.menubar/sass/jquery.menubar.css.map b/dist/jquery.menubar/sass/jquery.menubar.css.map
diff --git a/src/jquery.menubar/js/jquery.menubar.js b/src/jquery.menubar/js/jquery.menubar.js
@@ -166,7 +166,7 @@
         panelPopup.find('.menubar-item-arrows').addClass('menubar-item-arrows-panel-group-popup');
         // 弹出显示
         panelGroupElemOffset = panelGroupElem.offset();
-        panelPopup.find('.menubar-panel-group.thumbnail').removeClass('thumbnail');
+        panelPopup.find('.menubar-panel-group.menubar-panel-group-thumbnail').removeClass('menubar-panel-group-thumbnail');
         // 存储相关信息
         itemsInPanelGroupPopup.push({
             popup: panelPopup,
@@ -399,10 +399,10 @@
         menubarElem.find('.menubar-panel-group').each(function (i) {
             var panelGroupElem = $(this),
                 panelGroup = panelGroups[i],
-                className = panelGroup.state;
+                className = panelGroup.state === 'thumbnail' ? 'menubar-panel-group-thumbnail' : 'normal';
 
             if (!panelGroupElem.hasClass(className)) {
-                panelGroupElem.removeClass('normal').removeClass('thumbnail').addClass(className);
+                panelGroupElem.removeClass('normal').removeClass('menubar-panel-group-thumbnail').addClass(className);
             }
         });
     }
@@ -475,7 +475,7 @@
             panelGroupElem;
 
         // 点击菜单面板缩略图模式，弹出面板
-        if (regTitleInPanel.test(targetClassName) && (panelGroupElem = target.closest('.thumbnail')) && panelGroupElem.length === 1) {
+        if (regTitleInPanel.test(targetClassName) && (panelGroupElem = target.closest('.menubar-panel-group-thumbnail')) && panelGroupElem.length === 1) {
             // 创建一个菜单面板当前所在分组的副本
             menubarElem = panelGroupElem.closest('.menubar');
             menuId = menubarElem.attr('data-menuId');

diff --git a/src/jquery.menubar/sass/jquery.menubar.scss b/src/jquery.menubar/sass/jquery.menubar.scss
@@ -58,7 +58,7 @@
             }
         }
     }
-    >.menubar-panel-group.thumbnail {
+    >.menubar-panel-group.menubar-panel-group-thumbnail {
         height: 100%;
         .menubar-panel-title {
             background: none;