mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
jQuery 1.5.1 -> jQuery 1.6.1pre.
This commit is contained in:
parent
c6ebb58cf8
commit
390f8489dc
5 changed files with 8915 additions and 3 deletions
|
@ -132,6 +132,7 @@
|
|||
position: relative;
|
||||
background-color: #F6F6F6;
|
||||
overflow: hidden;
|
||||
clear: both;
|
||||
}
|
||||
.NB-modal .NB-modal-feed-title {
|
||||
display: block;
|
||||
|
|
8907
media/js/jquery-1.6.js
vendored
Normal file
8907
media/js/jquery-1.6.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
|
@ -1370,7 +1370,7 @@ $.fn.layout = function (opts) {
|
|||
var initContainer = function () {
|
||||
var
|
||||
$C = $Container // alias
|
||||
, tag = sC.tagName = $C.attr("tagName")
|
||||
, tag = sC.tagName = $.prop?$C.prop("tagName"):$C.attr("tagName")
|
||||
, fullPage= (tag == "BODY")
|
||||
, props = "position,margin,padding,border"
|
||||
, CSS = {}
|
||||
|
@ -1745,7 +1745,7 @@ $.fn.layout = function (opts) {
|
|||
s.isHidden = false; // true = pane is hidden - no spacing, resizer or toggler is visible!
|
||||
}
|
||||
// state for all panes
|
||||
s.tagName = $P.attr("tagName");
|
||||
s.tagName = $.prop?$P.prop("tagName"):$P.attr("tagName");
|
||||
s.edge = pane // useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
|
||||
s.noRoom = false; // true = pane 'automatically' hidden due to insufficient room - will unhide automatically
|
||||
s.isVisible = true; // false = pane is invisible - closed OR hidden - simplify logic
|
||||
|
|
|
@ -270,6 +270,10 @@ NEWSBLUR.log = function(msg) {
|
|||
children = args[1];
|
||||
} else {
|
||||
props = args[1];
|
||||
if (props.className) {
|
||||
props['class'] = props.className;
|
||||
delete props.className;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ MIDDLEWARE_CLASSES = (
|
|||
COMPRESS_JS = {
|
||||
'all': {
|
||||
'source_filenames': (
|
||||
'js/jquery-1.5.1.js',
|
||||
'js/jquery-1.6.js',
|
||||
'js/inflector.js',
|
||||
'js/jquery.json.js',
|
||||
'js/jquery.easing.js',
|
||||
|
|
Loading…
Add table
Reference in a new issue