Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Directive should not create a new scope #65

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Directive should not create a new scope #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e796606
Add IntelliJ to gitignore
Leward Sep 13, 2016
78c7699
Directive should not create new scope
Leward Sep 13, 2016
86e643c
Directive attributes passed using array notation
Leward Jun 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@
ehthumbs.db
Thumbs.db

# IDE #
#######
.idea/
*.iml

node_modules
65 changes: 35 additions & 30 deletions src/angular-resizable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
angular.module('angularResizable', [])
.directive('resizable', function() {
.directive('resizable', ['$parse', function($parse) {
var toCall;
function throttle(fun) {
if (toCall === undefined) {
Expand All @@ -14,42 +14,47 @@ angular.module('angularResizable', [])
}
return {
restrict: 'AE',
scope: {
rDirections: '=',
rCenteredX: '=',
rCenteredY: '=',
rWidth: '=',
rHeight: '=',
rFlex: '=',
rGrabber: '@',
rDisabled: '@',
rNoThrottle: '=',
resizable: '@',
},
/*
Do not use isolated scope. Use attr instead. Attr should behave like the following isolated scope:
rDirections: '=',
rCenteredX: '=',
rCenteredY: '=',
rWidth: '=',
rHeight: '=',
rFlex: '=',
rGrabber: '@',
rDisabled: '@',
rNoThrottle: '=',
resizable: '@',
*/
scope: false,
link: function(scope, element, attr) {
if (scope.resizable === 'false') return;
if (attr.resizable === 'false') return;

var flexBasis = 'flexBasis' in document.documentElement.style ? 'flexBasis' :
'webkitFlexBasis' in document.documentElement.style ? 'webkitFlexBasis' :
'msFlexPreferredSize' in document.documentElement.style ? 'msFlexPreferredSize' : 'flexBasis';

var rFlex = $parse(attr.rFlex)();
var rNoThrottle = $parse(attr.rNoThrottle);

// 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';
scope.$watch(attr.rWidth, function(value){
element[0].style[rFlex ? flexBasis : 'width'] = value + 'px';
});
scope.$watch('rHeight', function(value){
element[0].style[scope.rFlex ? flexBasis : 'height'] = scope.rHeight + 'px';
element[0].style[rFlex ? flexBasis : 'height'] = value + 'px';
});

element.addClass('resizable');

var style = window.getComputedStyle(element[0], null),
w,
h,
dir = scope.rDirections || ['right'],
vx = scope.rCenteredX ? 2 : 1, // if centered double velocity
vy = scope.rCenteredY ? 2 : 1, // if centered double velocity
inner = scope.rGrabber ? scope.rGrabber : '<span></span>',
dir = $parse(attr.rDirections)() || ['right'],
vx = $parse(attr.rCenteredX)() ? 2 : 1, // if centered double velocity
vy = $parse(attr.rCenteredY)() ? 2 : 1, // if centered double velocity
inner = attr.rGrabber ? attr.rGrabber : '<span></span>',
start,
dragDir,
axis,
Expand All @@ -58,9 +63,9 @@ angular.module('angularResizable', [])
var updateInfo = function(e) {
info.width = false; info.height = false;
if(axis === 'x')
info.width = parseInt(element[0].style[scope.rFlex ? flexBasis : 'width']);
info.width = parseInt(element[0].style[rFlex ? flexBasis : 'width']);
else
info.height = parseInt(element[0].style[scope.rFlex ? flexBasis : 'height']);
info.height = parseInt(element[0].style[rFlex ? flexBasis : 'height']);
info.id = element[0].id;
info.evt = e;
};
Expand All @@ -77,27 +82,27 @@ angular.module('angularResizable', [])
var prop, offset = axis === 'x' ? start - getClientX(e) : start - getClientY(e);
switch(dragDir) {
case 'top':
prop = scope.rFlex ? flexBasis : 'height';
prop = rFlex ? flexBasis : 'height';
element[0].style[prop] = h + (offset * vy) + 'px';
break;
case 'bottom':
prop = scope.rFlex ? flexBasis : 'height';
prop = rFlex ? flexBasis : 'height';
element[0].style[prop] = h - (offset * vy) + 'px';
break;
case 'right':
prop = scope.rFlex ? flexBasis : 'width';
prop = rFlex ? flexBasis : 'width';
element[0].style[prop] = w - (offset * vx) + 'px';
break;
case 'left':
prop = scope.rFlex ? flexBasis : 'width';
prop = rFlex ? flexBasis : 'width';
element[0].style[prop] = w + (offset * vx) + 'px';
break;
}
updateInfo(e);
function resizingEmit(){
scope.$emit('angular-resizable.resizing', info);
}
if (scope.rNoThrottle) {
if (rNoThrottle()) {
resizingEmit();
} else {
throttle(resizingEmit);
Expand Down Expand Up @@ -149,7 +154,7 @@ angular.module('angularResizable', [])
grabber.ondragstart = function() { return false; };

var down = function(e) {
var disabled = (scope.rDisabled === 'true');
var disabled = (attr.rDisabled === 'true');
if (!disabled && (e.which === 1 || e.touches)) {
// left mouse click or touch screen
dragStart(e, direction);
Expand All @@ -160,4 +165,4 @@ angular.module('angularResizable', [])
});
}
};
});
}]);