From e053207eb1ac1ac309ad4112bfd588d4331b997e Mon Sep 17 00:00:00 2001 From: gucheen Date: Tue, 25 Feb 2014 09:29:46 +0800 Subject: [PATCH 1/8] fix a bug under firefox --- .gitignore | 2 +- index.html | 4 ++-- jquery.popmenu.min.js | 2 +- src/jquery.popmenu.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 38f8e88..723ef36 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dev +.idea \ No newline at end of file diff --git a/index.html b/index.html index 546c8fc..58b0258 100644 --- a/index.html +++ b/index.html @@ -35,8 +35,8 @@

jQuery pop menu

-

How to use:

-
-  $('#demo_box').popmenu();
-        
+

How to use:

+
$('#demo_box').popmenu({parameters});
+

You can use parameters below.

+
{
+    'controller': true,       // use control button or not
+    'width': '300px',         // width of menu
+    'background': '#34495e',  // background color of menu
+    'focusColor': '#1abc9c',  // hover color of menu's buttons
+    'borderRadius': '10px',   // radian of angles, '0' for right angle
+    'top': '50',              // pixels that move up
+    'left': '0',              // pixels that move left
+    'iconSize': '100px'       // size of menu's buttons
+}

Find more information on github.

- + - \ No newline at end of file + diff --git a/src/jquery.popmenu.js b/src/jquery.popmenu.js index d50b34e..c2fc819 100644 --- a/src/jquery.popmenu.js +++ b/src/jquery.popmenu.js @@ -17,7 +17,9 @@ Based on jQuery 2.0.3 'borderRadius': '10px', 'top': '50', 'left': '0', - 'iconSize': '100px' + 'iconSize': '100px', + 'color': '#fff', + 'border': '0px' }, options); if (settings.controller === true) { var temp_display = 'none'; @@ -40,11 +42,12 @@ Based on jQuery 2.0.3 'width': settings.width, 'float': 'left', 'padding': '0', - 'border-radius': settings.borderRadius + 'border-radius': settings.borderRadius, + 'border': settings.border }); tar_list.css({ 'display': 'block', - 'color': '#fff', + 'color': settings.color, 'float': 'left', 'width': settings.iconSize, 'height': settings.iconSize, @@ -53,7 +56,7 @@ Based on jQuery 2.0.3 }); tar_a.css({ 'text-decoration': 'none', - 'color': '#fff' + 'color': settings.color }); tar_ctrl.hover(function () { tar_ctrl.css('cursor', 'pointer'); @@ -87,4 +90,4 @@ Based on jQuery 2.0.3 }; -}(jQuery)); \ No newline at end of file +}(jQuery)); From 6f1fb9129e036008aeb35bf8f0296ea2a3d0b27a Mon Sep 17 00:00:00 2001 From: Cheng Gu Date: Thu, 29 Dec 2016 17:08:23 +0800 Subject: [PATCH 7/8] Create .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6347583 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.html linguist-language=javascript From 7a1cbd36d54b0e1f77fd696615a5a1fe8a341300 Mon Sep 17 00:00:00 2001 From: Cheng Gu Date: Thu, 29 Dec 2016 17:09:35 +0800 Subject: [PATCH 8/8] Update .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6347583..8bc46bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -*.html linguist-language=javascript +*.html linguist-language=JavaScript