From fdff43b44e62fb789ff31a11543cee01604b7cda Mon Sep 17 00:00:00 2001 From: Luca Damasco Date: Sat, 15 Sep 2018 15:17:15 -0400 Subject: [PATCH 1/3] Added MIT License information from about page to .txt file for github licensing system. --- LICENSE.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..2f5acd1 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,7 @@ +Copyright 2015 dgoguerra + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From d672d3c2470a7645e9b1d7c6c853758e1e938781 Mon Sep 17 00:00:00 2001 From: Luca Damasco Date: Sat, 15 Sep 2018 15:26:23 -0400 Subject: [PATCH 2/3] Added in small change to make this compatible with BS4 from tpv-ebben --- src/BootstrapMenu.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapMenu.js b/src/BootstrapMenu.js index 883c48a..659a820 100644 --- a/src/BootstrapMenu.js +++ b/src/BootstrapMenu.js @@ -119,7 +119,7 @@ function renderMenu(_this) { if (actionsHaveIcon === true) { $ul.append( '
  • ' + - '' + + '' + ' ' + '' + '' + @@ -130,7 +130,7 @@ function renderMenu(_this) { else { $ul.append( '
  • ' + - '' + + '' + '
  • ' ); } @@ -138,7 +138,7 @@ function renderMenu(_this) { $ul.append( '' @@ -167,7 +167,7 @@ function setupOpenEventListeners(_this) { // install the handler for every future elements where // the context menu will open - _this.$container.on(openEventName + _this.namespace, _this.selector, function(evt) { + _this.$container.on(openEventName + _this.namespace, _this.selector, function(evt) { var $openTarget = $(this); _this.open($openTarget, evt); From a0c88732d3f52e3fd33741a6faa2d55906543420 Mon Sep 17 00:00:00 2001 From: Luca Damasco Date: Mon, 17 Sep 2018 12:01:48 -0400 Subject: [PATCH 3/3] Updated dividers to dropdown-divider for BS4 --- .DS_Store | Bin 0 -> 6148 bytes dist/BootstrapMenu.js | 6 +++--- src/BootstrapMenu.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d4bfed1405e5afa534db2caebdb4c3160977f0a7 GIT binary patch literal 6148 zcmeHK!H&}~5FKv=q+MW(1T4o~kT|TWE|(%9q|$8i}v-~ebhX-k_WO{ylPETyOy zzJdJ(zJyQUbKs5bt(ue-H>i+DvY%tmjAxz`J0>F0m~{7v%0y(NFj^&4zY!kivL;)) z=PFRJk9HV${4naM97FDQE0j0U`_ddq%{FEY-D4pp+w@(qpG^Sq8 z=3CCjCZ8tI52*|5ga%oCv76Jkpcg>5V&xr*7({lceE|U-8pZFCF;0{XCAtW!v*#1ik5D`T9W|rCt#A#?mgFtX`Bp6o@H?hX zR*SO`_DUAlXo@KOWmFZ!hG^)md;w*2IS&cUQ*<6 zqFBnt!LMt^8tHGI=oir5-n`IEM1}#wz&~by_Xh`sv958UP;MQlt^4A~e za0jriaiI`B5TQ(g%2enphR`<$q0BK}*ZK>E%AACp8GiK4Lf=q?zIX^ns*|WIG__&C zFpy=SpdQP7{LD%;5&Gu5qCdJrMIFAZaj_Vc@Sa@C$|f@^%0K literal 0 HcmV?d00001 diff --git a/dist/BootstrapMenu.js b/dist/BootstrapMenu.js index baa3a0c..80741c6 100644 --- a/dist/BootstrapMenu.js +++ b/dist/BootstrapMenu.js @@ -173,7 +173,7 @@ if (actionsHaveIcon === true) { $ul.append( '
  • ' + - '' + + '' + ' ' + '' + '' + @@ -184,7 +184,7 @@ else { $ul.append( '
  • ' + - '' + + '' + '
  • ' ); } @@ -192,7 +192,7 @@ $ul.append( '' diff --git a/src/BootstrapMenu.js b/src/BootstrapMenu.js index 659a820..c3f6bce 100644 --- a/src/BootstrapMenu.js +++ b/src/BootstrapMenu.js @@ -107,7 +107,7 @@ function renderMenu(_this) { return; if (isFirstNonEmptyGroup === false) { - $ul.append('
  • '); + $ul.append(''); } isFirstNonEmptyGroup = false;