Merge branch 'v3'

This commit is contained in:
Zixaphir 2013-12-25 18:10:52 -07:00
commit 4ee6e58994
3 changed files with 30 additions and 26 deletions

View File

@ -4203,17 +4203,15 @@
return Header.previousOffset = offsetY; return Header.previousOffset = offsetY;
}, },
setBarPosition: function(bottom) { setBarPosition: function(bottom) {
var args;
Header.barPositionToggler.checked = bottom; Header.barPositionToggler.checked = bottom;
$.event('CloseMenu'); $.event('CloseMenu');
if (bottom) { args = bottom ? ['bottom-header', 'top-header', 'bottom', 'after'] : ['top-header', 'bottom-header', 'top', 'add'];
$.addClass(doc, 'bottom-header'); $.addClass(doc, args[0]);
$.rmClass(doc, 'top-header'); $.rmClass(doc, args[1]);
return Header.bar.parentNode.className = 'bottom'; Header.bar.parentNode.className = args[2];
} else { return $[args[3]](Header.bar, Header.notify);
$.addClass(doc, 'top-header');
$.rmClass(doc, 'bottom-header');
return Header.bar.parentNode.className = 'top';
}
}, },
toggleBarPosition: function() { toggleBarPosition: function() {
$.cb.checked.call(this); $.cb.checked.call(this);

View File

@ -4228,17 +4228,15 @@
return Header.previousOffset = offsetY; return Header.previousOffset = offsetY;
}, },
setBarPosition: function(bottom) { setBarPosition: function(bottom) {
var args;
Header.barPositionToggler.checked = bottom; Header.barPositionToggler.checked = bottom;
$.event('CloseMenu'); $.event('CloseMenu');
if (bottom) { args = bottom ? ['bottom-header', 'top-header', 'bottom', 'after'] : ['top-header', 'bottom-header', 'top', 'add'];
$.addClass(doc, 'bottom-header'); $.addClass(doc, args[0]);
$.rmClass(doc, 'top-header'); $.rmClass(doc, args[1]);
return Header.bar.parentNode.className = 'bottom'; Header.bar.parentNode.className = args[2];
} else { return $[args[3]](Header.bar, Header.notify);
$.addClass(doc, 'top-header');
$.rmClass(doc, 'bottom-header');
return Header.bar.parentNode.className = 'top';
}
}, },
toggleBarPosition: function() { toggleBarPosition: function() {
$.cb.checked.call(this); $.cb.checked.call(this);

View File

@ -250,14 +250,22 @@ Header =
setBarPosition: (bottom) -> setBarPosition: (bottom) ->
Header.barPositionToggler.checked = bottom Header.barPositionToggler.checked = bottom
$.event 'CloseMenu' $.event 'CloseMenu'
if bottom args = if bottom then [
$.addClass doc, 'bottom-header' 'bottom-header'
$.rmClass doc, 'top-header' 'top-header'
Header.bar.parentNode.className = 'bottom' 'bottom'
else 'after'
$.addClass doc, 'top-header' ] else [
$.rmClass doc, 'bottom-header' 'top-header'
Header.bar.parentNode.className = 'top' 'bottom-header'
'top'
'add'
]
$.addClass doc, args[0]
$.rmClass doc, args[1]
Header.bar.parentNode.className = args[2]
$[args[3]] Header.bar, Header.notify
toggleBarPosition: -> toggleBarPosition: ->
$.cb.checked.call @ $.cb.checked.call @