From 3751623e5dce9385bda1136e293f3fe2c1bcac65 Mon Sep 17 00:00:00 2001 From: Isaac Mann Date: Tue, 24 Oct 2017 16:41:08 -0400 Subject: [PATCH] chore: Release 2.0.0-beta.1 --- CHANGELOG.md | 10 + README.md | 4 +- package-lock.json | 255 +++++++++++++++--------- package.json | 24 +-- src/lib/contextMenu.item.directive.ts | 5 +- src/lib/contextMenuContent.component.ts | 4 +- 6 files changed, 184 insertions(+), 118 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46b1f7e..558ff9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +# [2.0.0-beta.1](https://github.com/isaacplmann/ngx-contextmenu) (2017-10-24) + + +### BREAKING CHANGES + +* **dependencies:** Using @angular/cdk for creating and positioning the contextmenu +* **dependencies:** Support angular 4.x and 5.x + + # [1.3.5](https://github.com/isaacplmann/ngx-contextmenu) (2017-08-09) diff --git a/README.md b/README.md index ea57ec6..8da87ea 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # ngx-contextmenu -A context menu built with Angular 2 inspired by [ui.bootstrap.contextMenu](https://github.com/Templarian/ui.bootstrap.contextMenu). Bootstrap classes are included in the markup, but there is no explicit dependency on Bootstrap. [Demo](https://isaacplmann.github.io/ngx-contextmenu/) +A context menu built with Angular (2+) inspired by [ui.bootstrap.contextMenu](https://github.com/Templarian/ui.bootstrap.contextMenu). Bootstrap classes are included in the markup, but there is no explicit dependency on Bootstrap. [Demo](https://isaacplmann.github.io/ngx-contextmenu/) ## Installation -- `npm install ngx-contextmenu` +- `npm install ngx-contextmenu @angular/cdk@2.0.0-beta.12` - import ContextMenuModule into your app module ## Usage diff --git a/package-lock.json b/package-lock.json index b023ccd..2d8fa7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ngx-contextmenu", - "version": "1.3.5", + "version": "2.0.0-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -114,7 +114,7 @@ "style-loader": "0.13.2", "stylus": "0.54.5", "stylus-loader": "3.0.1", - "typescript": "2.2.2", + "typescript": "2.5.3", "url-loader": "0.6.2", "webpack": "3.6.0", "webpack-concat-plugin": "1.4.0", @@ -162,32 +162,33 @@ } }, "@angular/common": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.4.tgz", - "integrity": "sha1-rgqBiqoMaj8JAee4C9lOHCLrk2U=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0-rc.5.tgz", + "integrity": "sha1-j/48q0UOUzUUdQ79+n/V/Zh0vFE=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/compiler": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.4.tgz", - "integrity": "sha1-Mm6wAp2aNUGqyhJN75rcUcNvK0E=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0-rc.5.tgz", + "integrity": "sha1-an51sPV+i77pgW3QekPt7ZhbAcQ=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/compiler-cli": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.4.tgz", - "integrity": "sha1-BjCApJfZF1OWglBQIixxfaGE9s8=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0-rc.5.tgz", + "integrity": "sha1-pIj1sTgjYH04Uf5sMNVkAtOlKQY=", "dev": true, "requires": { - "@angular/tsc-wrapped": "4.4.4", + "chokidar": "1.7.0", "minimist": "1.2.0", - "reflect-metadata": "0.1.10" + "reflect-metadata": "0.1.10", + "tsickle": "0.24.1" }, "dependencies": { "minimist": { @@ -199,50 +200,41 @@ } }, "@angular/core": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.4.tgz", - "integrity": "sha1-vTfs9UFY+XSJmWyThr0iL4CjL1w=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0-rc.5.tgz", + "integrity": "sha1-JuoZ9UK3hvzKOAhNZP1uMbk7pnU=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.4.tgz", - "integrity": "sha1-o4mOLnup2E/6DUcUTGlxF5x1ruY=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0-rc.5.tgz", + "integrity": "sha1-Bj3e6ICcfux9LZIHugM2WPVfItw=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser-dynamic": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.4.tgz", - "integrity": "sha1-w8nrhUpShVagcFQSeTLlJ/qTLhQ=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0-rc.5.tgz", + "integrity": "sha1-SciUyZQxg/p3MyB8gP8NBl7UXM4=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/router": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.4.tgz", - "integrity": "sha1-e+ORCW6EPLPgT58F0dZaiN+bx88=", + "version": "5.0.0-rc.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0-rc.5.tgz", + "integrity": "sha1-nZNxT8APrmFaCnhaNGUAa0mmRCA=", "dev": true, "requires": { "tslib": "1.7.1" } }, - "@angular/tsc-wrapped": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.4.tgz", - "integrity": "sha1-mEGCHlVha4JsoWAlD+heFfx0/8M=", - "dev": true, - "requires": { - "tsickle": "0.21.6" - } - }, "@ngtools/json-schema": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", @@ -274,9 +266,9 @@ "dev": true }, "@types/node": { - "version": "6.0.89", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.89.tgz", - "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==", + "version": "6.0.90", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz", + "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==", "dev": true }, "@types/q": { @@ -331,9 +323,9 @@ } }, "adm-zip": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", - "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", + "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", "dev": true }, "after": { @@ -1344,9 +1336,9 @@ "dev": true }, "codelyzer": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.1.tgz", - "integrity": "sha512-mIRlNReJyyYaI1uG4rPz+fnZ9BddxLBEWTEmLh0eS8t25Pp3nPeDJt4cwmjKL6JncLuIAP9oUrKu/XjlOj4D+w==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.2.tgz", + "integrity": "sha512-VNvW9gRThsqRarEnLioiILd0Pdk0yCq/7cVgYvqHpC+3CHqfnrJfmXjoana7vzWfSis+9pODXofjCWX+nlU9Gw==", "dev": true, "requires": { "app-root-path": "2.0.1", @@ -2601,6 +2593,12 @@ "event-emitter": "0.3.5" } }, + "es6-promise": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=", + "dev": true + }, "es6-set": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", @@ -4358,7 +4356,7 @@ "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -4391,7 +4389,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -4949,6 +4947,12 @@ "xmldom": "0.1.27" } }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", + "dev": true + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -5341,13 +5345,13 @@ "istanbul-lib-coverage": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "integrity": "sha1-c7+5mIhSmUFck9OKPprfeEp3qdo=", "dev": true }, "istanbul-lib-hook": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz", - "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==", + "integrity": "sha1-3WYH8DB2V4/n1vKmMM8UO0m6zdw=", "dev": true, "requires": { "append-transform": "0.4.0" @@ -5371,7 +5375,7 @@ "istanbul-lib-report": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz", - "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==", + "integrity": "sha1-8OVfVmVf+jQiIIC3oM1HYOFAX8k=", "dev": true, "requires": { "istanbul-lib-coverage": "1.1.1", @@ -5383,7 +5387,7 @@ "istanbul-lib-source-maps": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz", - "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==", + "integrity": "sha1-pv4ay6jOCO68Y45XLilNJnAIqgw=", "dev": true, "requires": { "debug": "2.6.8", @@ -5396,7 +5400,7 @@ "istanbul-reports": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz", - "integrity": "sha512-P8G873A0kW24XRlxHVGhMJBhQ8gWAec+dae7ZxOBzxT4w+a9ATSPvRVK3LB1RAJ9S8bg2tOyWHAGW40Zd2dKfw==", + "integrity": "sha1-BCvlyJ4XW8P4ZSPKqynAFOd/7k4=", "dev": true, "requires": { "handlebars": "4.0.10" @@ -5504,20 +5508,20 @@ } }, "jasmine": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha1-ayLnCIPo5YnUVjRhU7TSBt2+IX8=", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", + "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, "requires": { "exit": "0.1.2", "glob": "7.1.2", - "jasmine-core": "2.6.3" + "jasmine-core": "2.8.0" }, "dependencies": { "jasmine-core": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.3.tgz", - "integrity": "sha1-RQcpUOSkKx4yL+VcABEApGXXeBU=", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz", + "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=", "dev": true } } @@ -5538,9 +5542,9 @@ } }, "jasminewd2": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.1.0.tgz", - "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz", + "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, "js-base64": { @@ -5658,6 +5662,53 @@ } } }, + "jszip": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz", + "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==", + "dev": true, + "requires": { + "core-js": "2.3.0", + "es6-promise": "3.0.2", + "lie": "3.1.1", + "pako": "1.0.6", + "readable-stream": "2.0.6" + }, + "dependencies": { + "core-js": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", + "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU=", + "dev": true + }, + "pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "dev": true + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "karma": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz", @@ -5849,6 +5900,15 @@ "ejs": "2.5.7" } }, + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "dev": true, + "requires": { + "immediate": "3.0.6" + } + }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", @@ -6265,7 +6325,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { "brace-expansion": "1.1.7" @@ -7642,28 +7702,34 @@ } }, "protractor": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.1.2.tgz", - "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.2.0.tgz", + "integrity": "sha1-0/ObGV6F81Oa2djLZWCp0rYyl8Q=", "dev": true, "requires": { - "@types/node": "6.0.89", + "@types/node": "6.0.90", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.42", "blocking-proxy": "0.0.5", "chalk": "1.1.3", "glob": "7.1.2", - "jasmine": "2.6.0", - "jasminewd2": "2.1.0", + "jasmine": "2.8.0", + "jasminewd2": "2.2.0", "optimist": "0.6.1", "q": "1.4.1", "saucelabs": "1.3.0", - "selenium-webdriver": "3.0.1", + "selenium-webdriver": "3.6.0", "source-map-support": "0.4.15", "webdriver-js-extender": "1.0.0", "webdriver-manager": "12.0.6" }, "dependencies": { + "adm-zip": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", + "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", + "dev": true + }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -7696,7 +7762,7 @@ "request": "2.81.0", "rimraf": "2.6.2", "semver": "5.3.0", - "xml2js": "0.4.17" + "xml2js": "0.4.19" }, "dependencies": { "minimist": { @@ -8301,15 +8367,15 @@ "dev": true }, "selenium-webdriver": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz", - "integrity": "sha1-ot6l2kqX9mcuiefKcnbO+jZRR6c=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", + "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, "requires": { - "adm-zip": "0.4.7", + "jszip": "3.1.4", "rimraf": "2.6.2", "tmp": "0.0.30", - "xml2js": "0.4.17" + "xml2js": "0.4.19" }, "dependencies": { "tmp": { @@ -9319,9 +9385,9 @@ } }, "tsickle": { - "version": "0.21.6", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz", - "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.24.1.tgz", + "integrity": "sha512-XloFQZhVhgjpQsi3u2ORNRJvuID5sflOg6HfP093IqAbhE1+fIUXznULpdDwHgG4p+v8w78KdHruQtkWUKx5AQ==", "dev": true, "requires": { "minimist": "1.2.0", @@ -9412,9 +9478,9 @@ } }, "typescript": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz", - "integrity": "sha1-YGAiUIR5tV/6NotY/uljoD39eww=", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", + "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==", "dev": true }, "uglify-js": { @@ -9815,12 +9881,6 @@ "selenium-webdriver": "2.53.3" }, "dependencies": { - "adm-zip": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz", - "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY=", - "dev": true - }, "sax": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", @@ -9853,7 +9913,7 @@ "dev": true, "requires": { "sax": "0.6.1", - "xmlbuilder": "4.2.1" + "xmlbuilder": "9.0.4" } } } @@ -10423,7 +10483,7 @@ "write-file-atomic": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz", - "integrity": "sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ==", + "integrity": "sha1-F2n0tVHu3OQZ8FBd6uLiZ2NULTc=", "dev": true, "requires": { "graceful-fs": "4.1.11", @@ -10460,23 +10520,20 @@ "dev": true }, "xml2js": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", - "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=", + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "dev": true, "requires": { "sax": "1.2.2", - "xmlbuilder": "4.2.1" + "xmlbuilder": "9.0.4" } }, "xmlbuilder": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz", - "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=", - "dev": true, - "requires": { - "lodash": "4.17.4" - } + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz", + "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=", + "dev": true }, "xmldom": { "version": "0.1.27", diff --git a/package.json b/package.json index 1c8bdaf..29ee956 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-contextmenu", - "version": "1.3.5", + "version": "2.0.0-beta.1", "description": "An Angular component to show a context menu on an arbitrary component", "keywords": [ "angular2", @@ -44,17 +44,17 @@ "devDependencies": { "@angular/cdk": "2.0.0-beta.12", "@angular/cli": "1.4.5", - "@angular/common": "4.4.x", - "@angular/compiler": "4.4.x", - "@angular/compiler-cli": "4.4.x", - "@angular/core": "4.4.x", - "@angular/platform-browser": "4.4.x", - "@angular/platform-browser-dynamic": "4.4.x", - "@angular/router": "4.4.x", + "@angular/common": "5.0.0-rc.5", + "@angular/compiler": "5.0.0-rc.5", + "@angular/compiler-cli": "5.0.0-rc.5", + "@angular/core": "5.0.0-rc.5", + "@angular/platform-browser": "5.0.0-rc.5", + "@angular/platform-browser-dynamic": "5.0.0-rc.5", + "@angular/router": "5.0.0-rc.5", "@types/jasmine": "2.5.47", - "@types/node": "^6.0.89", + "@types/node": "^6.0.90", "classlist.js": "^1.1.20150312", - "codelyzer": "^3.2.1", + "codelyzer": "^3.2.2", "copyfiles": "^1.2.0", "gh-pages": "0.12.0", "jasmine-core": "~2.5.2", @@ -65,11 +65,11 @@ "karma-coverage-istanbul-reporter": "^0.2.0", "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "^5.1.2", + "protractor": "^5.2.0", "rimraf": "^2.6.2", "ts-node": "~2.0.0", "tslint": "~4.5.0", - "typescript": "~2.2.2", + "typescript": "^2.5.3", "web-animations-js": "^2.3.1" } } diff --git a/src/lib/contextMenu.item.directive.ts b/src/lib/contextMenu.item.directive.ts index d485ef4..f46b5c9 100644 --- a/src/lib/contextMenu.item.directive.ts +++ b/src/lib/contextMenu.item.directive.ts @@ -1,6 +1,5 @@ -import { ContextMenuComponent } from './contextMenu.component'; -import { Directive, Input, Output, EventEmitter, TemplateRef, ElementRef } from '@angular/core'; import { Highlightable } from '@angular/cdk/a11y'; +import { Directive, ElementRef, EventEmitter, Input, Output, TemplateRef } from '@angular/core'; @Directive({ /* tslint:disable:directive-selector-type */ @@ -8,7 +7,7 @@ import { Highlightable } from '@angular/cdk/a11y'; /* tslint:enable:directive-selector-type */ }) export class ContextMenuItemDirective implements Highlightable { - @Input() public subMenu: ContextMenuComponent; + @Input() public subMenu: any; @Input() public divider = false; @Input() public enabled: boolean | ((item: any) => boolean) = true; @Input() public passive = false; diff --git a/src/lib/contextMenuContent.component.ts b/src/lib/contextMenuContent.component.ts index d80083a..3917ae9 100644 --- a/src/lib/contextMenuContent.component.ts +++ b/src/lib/contextMenuContent.component.ts @@ -55,13 +55,13 @@ const ARROW_LEFT_KEYCODE = 37; [class.active]="menuItem.isActive && isMenuItemEnabled(menuItem)" [class.disabled]="useBootstrap4 && !isMenuItemEnabled(menuItem)" [class.hasSubMenu]="!!menuItem.subMenu" (click)="onMenuItemSelect(menuItem, $event)" (mouseenter)="onOpenSubMenu(menuItem, $event)"> - + - +