Skip to content

Commit

Permalink
Update modal page to add buttons and animation
Browse files Browse the repository at this point in the history
  • Loading branch information
almasaeed2010 committed May 17, 2017
1 parent 4c25d55 commit ccb00cc
Show file tree
Hide file tree
Showing 13 changed files with 2,418 additions and 165 deletions.
5 changes: 4 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@
"bower_components",
"composer.json",
"documentation"
]
],
"dependencies": {

}
}
17 changes: 10 additions & 7 deletions build/js/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,18 @@
$('body').removeClass(ClassName.holdTransition)

if (this.options.resetHeight) {
$('body, html, ' + Selector.wrapper).css('height', 'auto')
$('body, html, ' + Selector.wrapper).css({
'height' : 'auto',
'min-height': '100%'
})
}

if (!this.bindedResize) {
$(window).resize(function () {
this.fix()
this.fixSidebar()
}.bind(this))
this.bindedResize = true;
this.bindedResize = true
}

$(Selector.sidebarMenu).on('expanded.tree', function () {
Expand Down Expand Up @@ -106,15 +109,15 @@
Layout.prototype.fixSidebar = function () {
// Make sure the body tag has the .fixed class
if (!$('body').hasClass(ClassName.fixed)) {
if (typeof $.fn.slimScroll != 'undefined') {
if (typeof $.fn.slimScroll !== 'undefined') {
$(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
}
return
}

// Enable slimscroll for fixed layout
if (this.options.slimscroll) {
if (typeof $.fn.slimScroll != 'undefined') {
if (typeof $.fn.slimScroll !== 'undefined') {
// Destroy if it exists
$(Selector.sidebar).slimScroll({ destroy: true }).height('auto')

Expand All @@ -136,12 +139,12 @@
var data = $this.data(DataKey)

if (!data) {
var options = $.extend({}, Default, $this.data(), typeof option == 'object' && option)
var options = $.extend({}, Default, $this.data(), typeof option === 'object' && option)
$this.data(DataKey, (data = new Layout(options)))
}

if (typeof option == 'string') {
if (typeof data[option] == 'undefined') {
if (typeof option === 'string') {
if (typeof data[option] === 'undefined') {
throw new Error('No method named ' + option)
}
data[option]()
Expand Down
Loading

0 comments on commit ccb00cc

Please sign in to comment.