Skip to content

Commit

Permalink
Merge tag '3.7.1' into development
Browse files Browse the repository at this point in the history
3.7.1
  • Loading branch information
Dirk Lüth committed Jul 25, 2015
2 parents db6ea21 + 2623fa8 commit 329312a
Show file tree
Hide file tree
Showing 374 changed files with 797 additions and 865 deletions.
2 changes: 0 additions & 2 deletions dist/3.7.0/min/dom/element.js

This file was deleted.

4 changes: 2 additions & 2 deletions dist/3.7.0/max/asset.js → dist/3.7.1/max/asset.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
4 changes: 2 additions & 2 deletions dist/3.7.0/max/base.js → dist/3.7.1/max/base.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
55 changes: 23 additions & 32 deletions dist/3.7.0/max/dom/element.js → dist/3.7.1/max/dom/element.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down Expand Up @@ -55,7 +55,7 @@
return element;
}
}
}, isTag = new RegExp("^<(\\w+)\\s*/>$"), matchEvent = new RegExp("^[^-]+"), pool = modules["pool/module"] && modules["pool/module"].create(modules["dom/event"], null, true) || null, hooks = modules["hook/css"], storage = {}, events = {
}, isTag = new RegExp("^<(\\w+)\\s*/>$"), matchEvent = new RegExp("^[^-]+"), splitList = new RegExp(" +", "g"), pool = modules["pool/module"] && modules["pool/module"].create(modules["dom/event"], null, true) || null, hooks = modules["hook/css"], storage = {}, events = {
custom: {
type: "CustomEvent",
method: "initCustomEvent"
Expand Down Expand Up @@ -109,6 +109,9 @@
}
return element;
}
function resolveArguments(parameters) {
return Array.prototype.concat.apply([], Array.prototype.splice.call(parameters, 0)).join(" ").split(splitList);
}
function matchesDelegate(event, delegate) {
var i = 0, pointer;
for (;(pointer = event.path[i]) !== undefined; i++) {
Expand Down Expand Up @@ -146,7 +149,7 @@
self.setStyles(styles);
}
if (self !== this) {
self.dispose && self.dispose();
this.dispose && this.dispose();
}
return self;
},
Expand Down Expand Up @@ -182,13 +185,10 @@
return self.element.getAttribute(attribute);
}
},
getAttributes: function(attributes) {
var self = this, result = {}, i = 0, attribute;
if (attributes) {
attributes = typeof attributes === stringString ? attributes.split(" ") : attributes;
for (;(attribute = attributes[i]) !== undefined; i++) {
result[attribute] = self.element.getAttributes(attribute);
}
getAttributes: function() {
var self = this, result = {}, attributes = resolveArguments(arguments), i = 0, attribute;
for (;(attribute = attributes[i]) !== undefined; i++) {
result[attribute] = self.element.getAttribute(attribute);
}
return result;
},
Expand All @@ -215,13 +215,10 @@
}
return self;
},
removeAttributes: function(attributes) {
var self = this, i = 0, attribute;
if (attributes) {
attributes = typeof attributes === stringString ? attributes.split(" ") : attributes;
for (;(attribute = attributes[i]) !== undefined; i++) {
self.element.removeAttribute(attribute);
}
removeAttributes: function() {
var self = this, attributes = resolveArguments(arguments), i = 0, attribute;
for (;(attribute = attributes[i]) !== undefined; i++) {
self.element.removeAttribute(attribute);
}
return self;
},
Expand All @@ -231,13 +228,10 @@
return hooks.process("get", self.element, property);
}
},
getStyles: function(properties) {
var self = this, result = {}, i = 0, property;
if (properties) {
properties = typeof properties === stringString ? properties.split(" ") : properties;
for (;(property = properties[i]) !== undefined; i++) {
result[property] = hooks.process("get", self.element, property);
}
getStyles: function() {
var self = this, result = {}, properties = resolveArguments(arguments), i = 0, property;
for (;(property = properties[i]) !== undefined; i++) {
result[property] = hooks.process("get", self.element, property);
}
return result;
},
Expand All @@ -264,13 +258,10 @@
}
return self;
},
removeStyles: function(properties) {
var self = this, i = 0, property;
if (properties) {
properties = typeof properties === stringString ? properties.split(" ") : properties;
for (;(property = properties[i]) !== undefined; i++) {
self.setStyle(property, "");
}
removeStyles: function() {
var self = this, properties = resolveArguments(arguments), i = 0, property;
for (;(property = properties[i]) !== undefined; i++) {
self.setStyle(property, "");
}
return self;
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down Expand Up @@ -83,8 +83,7 @@
_state: null,
_priority: null,
_constructor: function(element, settings) {
var self = this;
prototype._parent._constructor.call(self, element);
var self = prototype._parent._constructor.call(this, element);
settings = modules["function/merge"]({}, defaults, settings || {});
if (settings.threshold === "auto") {
delete settings.threshold;
Expand All @@ -108,6 +107,7 @@
instanceOnResize.call(self);
});
instanceOnResize.call(self);
return self;
},
remove: function() {
var self = this;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down Expand Up @@ -31,8 +31,7 @@
}
prototype = modules["dom/element/emerge"].extend({
_constructor: function(element, settings) {
var self = this;
prototype._parent._constructor.call(self, element, modules["function/merge"]({}, defaults, settings || {}));
var self = prototype._parent._constructor.call(this, element, modules["function/merge"]({}, defaults, settings || {}));
self.on(EVENT_EMERGED, function onEmerge(event) {
if (queue === 0 || event.data === 1) {
self.remove();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down Expand Up @@ -127,8 +127,8 @@
}
prototype = modules["dom/element"].extend({
_constructor: function(element, settings) {
var self = this, foreground, background;
prototype._parent._constructor.call(self, element);
var self, foreground, background;
self = prototype._parent._constructor.call(this, element);
self._settings = settings = modules["function/merge"]({}, defaults, settings);
foreground = self.getAttribute(settings.attribute);
background = self.getStyle("backgroundImage");
Expand All @@ -138,6 +138,7 @@
if (background !== "none" && regexBackground.test(background)) {
processMain.call(self, background, true);
}
return self;
},
hide: function() {
this.setStyles({
Expand All @@ -155,13 +156,14 @@
loader = modules["dom/element"].extend({
_url: null,
_constructor: function(url, element) {
var self = this;
var self;
if (!element) {
element = pool && pool.obtain("img") || document.createElement("img");
}
loader._parent._constructor.call(self, element);
self = loader._parent._constructor.call(this, element);
self._url = url;
processTransport.call(self, modules["transport/xhr"]);
return self;
}
});
return prototype;
Expand Down
4 changes: 2 additions & 2 deletions dist/3.7.0/max/dom/event.js → dist/3.7.1/max/dom/event.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
4 changes: 2 additions & 2 deletions dist/3.7.0/max/emitter.js → dist/3.7.1/max/emitter.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
4 changes: 2 additions & 2 deletions dist/3.7.0/max/hook/css.js → dist/3.7.1/max/hook/css.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
4 changes: 2 additions & 2 deletions dist/3.7.0/max/hook/event.js → dist/3.7.1/max/hook/event.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* Qoopido.js library
*
* version: 3.7.0
* date: 2015-07-23
* version: 3.7.1
* date: 2015-07-25
* author: Dirk Lueth <[email protected]>
* website: https://github.com/dlueth/qoopido.js
*
Expand Down
Loading

0 comments on commit 329312a

Please sign in to comment.