Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
hasanlussa committed Jan 25, 2017
2 parents 2d73f0a + 0dc921d commit 276ea47
Show file tree
Hide file tree
Showing 16 changed files with 149 additions and 159 deletions.
Binary file added .vscode/.BROWSE.VC.DB
Binary file not shown.
Binary file added .vscode/.BROWSE.VC.DB-wal
Binary file not shown.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "lussa-ui",
"description": "Responsive, Mobile-First, Front-End Frameworks for Angular-Based App on Lussa Team",
"version": "1.0.0",
"version": "1.0.1",
"homepage": "http://git.lussa.net/tarsius/lussa-ui",
"license": "MIT",
"main": [
Expand Down
38 changes: 30 additions & 8 deletions dist/css/lussa-ui.css

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

2 changes: 1 addition & 1 deletion dist/css/lussa-ui.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/lussa-ui.min.css

Large diffs are not rendered by default.

40 changes: 12 additions & 28 deletions dist/js/lussa-ui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* lussa-ui v0.0.1 (http://git.lussa.net/tarsius/tarsius-ui)
* Copyright 2014-2016 Muhammad Hasan
* lussa-ui v1.0.0 (http://git.lussa.net/tarsius/tarsius-ui)
* Copyright 2014-2017 Muhammad Hasan
* Licensed under MIT
*/

Expand Down Expand Up @@ -509,7 +509,7 @@ angular.module('lussa.ui.collapse', [])

var dropDown = angular.module('lussa.ui.dropdown',[]);

dropDown.directive('dropdown', ['$log', function($log){
dropDown.directive('dropdown', ['$log','$animate', function($log){
var SPEED_DEFAULT = 500,
EASING_DEFAULT = 'easeOutExpo';

Expand All @@ -519,44 +519,27 @@ dropDown.directive('dropdown', ['$log', function($log){
'isOpen': '@',
'onOpen': '&',
'onClose': '&',
'openEasing': '@',
'openSpeed': '@',
'closeEasing': '@',
'closeSpeed': '@',
'enableAnimation': '@',
'toggleByHover': '@'
},
restrict: 'AEC',
link: function(scope, element, attrs, controller) {
// init vars
var opened = attrs.isOpen || false,
var opened = scope.isOpen || false,
wrapper = element,
toggler = element.find('.dropdown-toggle, a:first, .button:first, button:first'),
content = element.find('.dropdown-content, .dropdown-menu'),
fx = {
open: {
speed: attrs.openSpeed || SPEED_DEFAULT,
easing: attrs.openEasing || EASING_DEFAULT,
},
close: {
speed: attrs.closeSpeed || SPEED_DEFAULT,
easing: attrs.closeEasing || EASING_DEFAULT,
}
};
content = element.find('.dropdown-content, .dropdown-menu');

// default state
if(opened)
content.show();
if(opened) open_menu();

/**
* [close_menu description]
* @return {[type]} [description]
*/
function close_menu(){
opened = false;
content.slideUp(fx.open.speed, fx.open.easing, function(){
wrapper.removeClass('open');
});

content.removeClass('open');
// callback
scope.onOpen(element);
}
Expand All @@ -567,9 +550,7 @@ dropDown.directive('dropdown', ['$log', function($log){
*/
function open_menu(){
opened = true;
content.slideDown(fx.close.speed, fx.close.easing);
wrapper.addClass('open');

content.addClass('open');
// callback
scope.onClose(element);
}
Expand Down Expand Up @@ -598,6 +579,9 @@ dropDown.directive('dropdown', ['$log', function($log){
});
}

toggler.on('blur', function(e){
close_menu();
});
}
};
}]);
Expand Down
10 changes: 5 additions & 5 deletions dist/js/lussa-ui.min.js

Large diffs are not rendered by default.

38 changes: 30 additions & 8 deletions docs/dist/css/lussa-ui.css

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

2 changes: 1 addition & 1 deletion docs/dist/css/lussa-ui.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/css/lussa-ui.min.css

Large diffs are not rendered by default.

40 changes: 12 additions & 28 deletions docs/dist/js/lussa-ui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* lussa-ui v0.0.1 (http://git.lussa.net/tarsius/tarsius-ui)
* Copyright 2014-2016 Muhammad Hasan
* lussa-ui v1.0.0 (http://git.lussa.net/tarsius/tarsius-ui)
* Copyright 2014-2017 Muhammad Hasan
* Licensed under MIT
*/

Expand Down Expand Up @@ -509,7 +509,7 @@ angular.module('lussa.ui.collapse', [])

var dropDown = angular.module('lussa.ui.dropdown',[]);

dropDown.directive('dropdown', ['$log', function($log){
dropDown.directive('dropdown', ['$log','$animate', function($log){
var SPEED_DEFAULT = 500,
EASING_DEFAULT = 'easeOutExpo';

Expand All @@ -519,44 +519,27 @@ dropDown.directive('dropdown', ['$log', function($log){
'isOpen': '@',
'onOpen': '&',
'onClose': '&',
'openEasing': '@',
'openSpeed': '@',
'closeEasing': '@',
'closeSpeed': '@',
'enableAnimation': '@',
'toggleByHover': '@'
},
restrict: 'AEC',
link: function(scope, element, attrs, controller) {
// init vars
var opened = attrs.isOpen || false,
var opened = scope.isOpen || false,
wrapper = element,
toggler = element.find('.dropdown-toggle, a:first, .button:first, button:first'),
content = element.find('.dropdown-content, .dropdown-menu'),
fx = {
open: {
speed: attrs.openSpeed || SPEED_DEFAULT,
easing: attrs.openEasing || EASING_DEFAULT,
},
close: {
speed: attrs.closeSpeed || SPEED_DEFAULT,
easing: attrs.closeEasing || EASING_DEFAULT,
}
};
content = element.find('.dropdown-content, .dropdown-menu');

// default state
if(opened)
content.show();
if(opened) open_menu();

/**
* [close_menu description]
* @return {[type]} [description]
*/
function close_menu(){
opened = false;
content.slideUp(fx.open.speed, fx.open.easing, function(){
wrapper.removeClass('open');
});

content.removeClass('open');
// callback
scope.onOpen(element);
}
Expand All @@ -567,9 +550,7 @@ dropDown.directive('dropdown', ['$log', function($log){
*/
function open_menu(){
opened = true;
content.slideDown(fx.close.speed, fx.close.easing);
wrapper.addClass('open');

content.addClass('open');
// callback
scope.onClose(element);
}
Expand Down Expand Up @@ -598,6 +579,9 @@ dropDown.directive('dropdown', ['$log', function($log){
});
}

toggler.on('blur', function(e){
close_menu();
});
}
};
}]);
Expand Down
10 changes: 5 additions & 5 deletions docs/dist/js/lussa-ui.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 276ea47

Please sign in to comment.