From 32255d2628808d22f4f6615e7cb242044b75d07b Mon Sep 17 00:00:00 2001 From: Cyrille Meichel Date: Tue, 21 Feb 2017 10:07:28 +0100 Subject: [PATCH 1/2] disable resize when rHeight/rWidth is equal to false --- src/angular-resizable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/angular-resizable.js b/src/angular-resizable.js index 22866f2..336787b 100644 --- a/src/angular-resizable.js +++ b/src/angular-resizable.js @@ -32,10 +32,10 @@ angular.module('angularResizable', []) // register watchers on width and height attributes if they are set scope.$watch('rWidth', function(value){ - element[0].style[scope.rFlex ? flexBasis : 'width'] = scope.rWidth + 'px'; + element[0].style[scope.rFlex ? flexBasis : 'width'] = (value !== false ? value + 'px' : ''); }); scope.$watch('rHeight', function(value){ - element[0].style[scope.rFlex ? flexBasis : 'height'] = scope.rHeight + 'px'; + element[0].style[scope.rFlex ? flexBasis : 'height'] = (value !== false ? value + 'px' : ''); }); element.addClass('resizable'); From eaef1edc566aefdca59c81f3f023cc9e05904676 Mon Sep 17 00:00:00 2001 From: Cyrille Meichel Date: Tue, 21 Feb 2017 10:14:50 +0100 Subject: [PATCH 2/2] tag --- .gitignore | 3 ++- bower.json | 4 ++-- package.json | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8cec646..05b2798 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ ehthumbs.db Thumbs.db -node_modules \ No newline at end of file +node_modules +.vscode \ No newline at end of file diff --git a/bower.json b/bower.json index c55b8c9..7e1ed9d 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-resizable", - "version": "1.2.0", - "homepage": "https://github.com/Reklino/angular-resizable", + "version": "1.2.1", + "homepage": "https://github.com/landru29/angular-resizable", "authors": [ "Reklino " ], diff --git a/package.json b/package.json index 4a63be9..d2982cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-resizable", - "version": "1.2.0", + "version": "1.2.1", "description": "A directive for creating resizable containers in angular.", "keywords": [ "angular", @@ -18,14 +18,14 @@ }, "repository": { "type": "git", - "url": "https://github.com/Reklino/angular-resizable.git" + "url": "https://github.com/landru29/angular-resizable.git" }, "author": "Reklino", "license": "MIT", "bugs": { - "url": "https://github.com/Reklino/angular-resizable/issues" + "url": "https://github.com/landru29/angular-resizable/issues" }, - "homepage": "https://github.com/Reklino/angular-resizable", + "homepage": "https://github.com/landru29/angular-resizable", "devDependencies": { "gulp": "^3.8.11", "gulp-minify-css": "^1.1.1",