sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fix for safari/jquery bug

Browse source
This commit is contained in:
rolux 2011-05-11 18:33:19 +02:00
commit 70d17f3321
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
source/Ox.UI/js/Core/Ox.Container.js
View file

@ -9,9 +9,12 @@ Ox.Container = function(options, self) {
var that = new Ox.Element({}, self)
.options(options || {})
.addClass('OxContainer');
that.$content = new Ox.Element({}, self)
that.$content = new Ox.Element({})
.options(options || {})
.addClass('OxContent')
.appendTo(that);
/*.appendTo(that)*/;
that.append(that.$content);
// FIXME: that.append(that.$content) works, but
// that.$content.appendTo(that) is broken in Safari
return that;
};

2
source/Ox.UI/js/Core/Ox.DocPage.js
View file

@ -30,7 +30,7 @@ Ox.DocPage = function(options, self) {
.html(
'<code><b>' + (name || item.name) + '</b> ' +
'&lt;' + item.types.join('&gt;</code> or <code>&lt;') + '&gt; </code>' +
(item.default ? 'default: <code>' + item.default + ' </code>' : '') +
(item['default'] ? 'default: <code>' + item['default'] + ' </code>' : '') +
Ox.parseHTML(item.summary)
)
];

6
source/Ox.UI/js/Core/Ox.Element.js
View file

@ -291,12 +291,12 @@ Ox.Element = function() {
options <function> Gets or sets the options of an element object
# Usage
() -> <obj> all options
(key) -> <val> the value of option[key]
(key) -> <any> the value of option[key]
(key, value) -> <obj> this element
sets options[key] to value and calls self.setOption(key, value)
Sets options[key] to value and calls self.setOption(key, value)
if the key/value pair was added or modified
({key: value, ...}) -> <obj> this element
sets multiple options and calls self.setOption(key, value)
Sets multiple options and calls self.setOption(key, value)
for every key/value pair that was added or modified
# Arguments
key <str> the name of the option