Skip to content

Commit

Permalink
Merge pull request Reklino#24 from PhilippSoehnlein/master
Browse files Browse the repository at this point in the history
Made flex mode working in IE10.
  • Loading branch information
Reklino committed Aug 17, 2015
2 parents 56d4421 + f376a24 commit 4cd4272
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion angular-resizable.min.js

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

3 changes: 2 additions & 1 deletion src/angular-resizable.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ angular.module('angularResizable', [])
},
link: function(scope, element, attr) {
var flexBasis = 'flexBasis' in document.documentElement.style ? 'flexBasis' :
'webkitFlexBasis' in document.documentElement.style ? 'webkitFlexBasis' : 'flexBasis';
'webkitFlexBasis' in document.documentElement.style ? 'webkitFlexBasis' :
'msFlexPreferredSize' in document.documentElement.style ? 'msFlexPreferredSize' : 'flexBasis';

// register watchers on width and height attributes if they are set
scope.$watch('rWidth', function(value){
Expand Down

0 comments on commit 4cd4272

Please sign in to comment.