Skip to content

Feature/support resize callback in directive #78

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

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

Feature/support resize callback in directive #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2613935
support onResizeStart, onResizing, onResizeEnd callback in directive
kim-jeongki Jul 26, 2017
2555e15
add .idea at .gitignore
kim-jeongki Jul 26, 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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@
ehthumbs.db
Thumbs.db

node_modules
node_modules
.idea
2 changes: 1 addition & 1 deletion angular-resizable.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 16 additions & 7 deletions src/angular-resizable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,16 @@ angular.module('angularResizable', [])
rDisabled: '@',
rNoThrottle: '=',
resizable: '@',
rOnResizeStart: '&',
rOnResizing: '&',
rOnResizeEnd: '&'
},
link: function(scope, element, attr) {
if (scope.resizable === 'false') return;

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

// register watchers on width and height attributes if they are set
scope.$watch('rWidth', function(value){
Expand All @@ -57,10 +60,13 @@ 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']);
else
info.height = parseInt(element[0].style[scope.rFlex ? flexBasis : 'height']);
if (axis === 'x') {
info.width = scope.rFlex ? parseInt(element[0].style[flexBasis], 10) : element[0].offsetWidth;
scope.rWidth = info.width;
} else {
info.height = scope.rFlex ? parseInt(element[0].style[scope.rFlex], 10) : element[0].offsetHeight;
scope.rHeight = info.height;
}
info.id = element[0].id;
info.evt = e;
};
Expand Down Expand Up @@ -95,6 +101,7 @@ angular.module('angularResizable', [])
}
updateInfo(e);
function resizingEmit(){
scope.rOnResizing({info: info});
scope.$emit('angular-resizable.resizing', info);
}
if (scope.rNoThrottle) {
Expand All @@ -105,8 +112,9 @@ angular.module('angularResizable', [])
};
var dragEnd = function(e) {
updateInfo();
scope.$emit('angular-resizable.resizeEnd', info);
scope.$apply();
scope.$emit('angular-resizable.resizeEnd', info);
scope.rOnResizeEnd({event: e, info: info});
document.removeEventListener('mouseup', dragEnd, false);
document.removeEventListener('mousemove', dragging, false);
document.removeEventListener('touchend', dragEnd, false);
Expand Down Expand Up @@ -135,8 +143,9 @@ angular.module('angularResizable', [])
e.returnValue = false;

updateInfo(e);
scope.$emit('angular-resizable.resizeStart', info);
scope.$apply();
scope.$emit('angular-resizable.resizeStart', info);
scope.rOnResizeStart({event: e, info: info});
};

dir.forEach(function (direction) {
Expand Down