0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

fix for safari/jquery bug

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

11
source/Ox.Geo/Ox.Geo.js
View file

@ -6,10 +6,15 @@ Ox.load.Geo = function(options, callback) {
/*@ /*@
Ox.COUNTRIES <[o]> Array of countries Ox.COUNTRIES <[o]> Array of countries
See http://en.wikipedia.org/wiki/List_of_sovereign_states, A list of independent (or de-facto independent) countries and
http://en.wikipedia.org/wiki/ISO_3166-3 and http://www.imdb.com/country/ dependencies (see
<a href="http://en.wikipedia.org/wiki/List_of_sovereign_states">Wikipedia</a>),
other entities with
<a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>
country codes, and former countries according to <a href="http://en.wikipedia.org/wiki/ISO_3166-3">ISO 3166-3</a>
and <a href="http://www.imdb.com/country/">IMDb</a>.
area <n> Area of the country in square meters area <n> Area of the country in square meters
code <s> ISO 3166 country code code <s> ISO 3166-1 alpha-2 country code
dependencies <[s]> Array of dependencies of the country (country codes) dependencies <[s]> Array of dependencies of the country (country codes)
dependency <[s]> Array of countries the country is a dependency of (country codes) dependency <[s]> Array of countries the country is a dependency of (country codes)
east <n> Longitude of eastern boundary in deg east <n> Longitude of eastern boundary in deg

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) var that = new Ox.Element({}, self)
.options(options || {}) .options(options || {})
.addClass('OxContainer'); .addClass('OxContainer');
that.$content = new Ox.Element({}, self) that.$content = new Ox.Element({})
.options(options || {}) .options(options || {})
.addClass('OxContent') .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; return that;
}; };

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

@ -30,7 +30,7 @@ Ox.DocPage = function(options, self) {
.html( .html(
'<code><b>' + (name || item.name) + '</b> ' + '<code><b>' + (name || item.name) + '</b> ' +
'&lt;' + item.types.join('&gt;</code> or <code>&lt;') + '&gt; </code>' + '&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) 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 options <function> Gets or sets the options of an element object
# Usage # Usage
() -> <obj> all options () -> <obj> all options
(key) -> <val> the value of option[key] (key) -> <any> the value of option[key]
(key, value) -> <obj> this element (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 if the key/value pair was added or modified
({key: value, ...}) -> <obj> this element ({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 for every key/value pair that was added or modified
# Arguments # Arguments
key <str> the name of the option key <str> the name of the option