Skip to content

Commit

Permalink
[BUG #8514] fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
danielwagner committed Aug 22, 2014
1 parent c6c88a1 commit 7771818
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 316 deletions.
16 changes: 9 additions & 7 deletions framework/source/class/qx/bom/Font.js
Expand Up @@ -78,22 +78,22 @@ qx.Bootstrap.define("qx.bom.Font",
switch(part = parts[i])
{
case "bold":
font.setBold(true);
font.bold = true;
break;

case "italic":
font.setItalic(true);
font.italic = true;
break;

case "underline":
font.setDecoration("underline");
font.decoration = "underline";
break;

default:
var temp = parseInt(part, 10);

if (temp == part || qx.lang.String.contains(part, "px")) {
font.setSize(temp);
font.size = temp;
} else {
name.push(part);
}
Expand All @@ -103,7 +103,7 @@ qx.Bootstrap.define("qx.bom.Font",
}

if (name.length > 0) {
font.setFamily(name);
font.family = name;
}

return font;
Expand All @@ -119,7 +119,9 @@ qx.Bootstrap.define("qx.bom.Font",
fromConfig : function(config)
{
var font = new qx.bom.Font;
font.set(config);
for (var prop in config) {
font[prop] = config[prop];
}
return font;
},

Expand Down Expand Up @@ -209,7 +211,7 @@ qx.Bootstrap.define("qx.bom.Font",
/** The text color for this font */
color :
{
check : "Color",
check : "String",
nullable: true,
apply: "_applyColor"
},
Expand Down
2 changes: 1 addition & 1 deletion framework/source/class/qx/bom/request/SimpleXhr.js
Expand Up @@ -550,7 +550,7 @@ qx.Bootstrap.define("qx.bom.request.SimpleXhr",
* @param ctx {var?} The context of the listener.
* @return {qx.bom.request.Xhr} Self for chaining.
*/
addListenerOnce: function(name, listener, ctx) {
once: function(name, listener, ctx) {
this._transport._emitter.once(name, listener, ctx);
return this;
},
Expand Down
10 changes: 5 additions & 5 deletions framework/source/class/qx/bom/rest/Resource.js
Expand Up @@ -525,19 +525,19 @@ qx.Bootstrap.define("qx.bom.rest.Resource",
var reqHandler = this._getRequestHandler();

// Handle successful request
req.addListenerOnce(
req.once(
"success",
reqHandler.onsuccess.callback(req, action),
reqHandler.onsuccess.context
);
// Handle erroneous request
req.addListenerOnce(
req.once(
"fail",
reqHandler.onfail.callback(req, action),
reqHandler.onfail.context
);
// Handle loadend (Note that loadEnd is fired after "success")
req.addListenerOnce(
req.once(
"loadEnd",
reqHandler.onloadend.callback(req, action),
reqHandler.onloadend.context
Expand Down Expand Up @@ -844,7 +844,7 @@ qx.Bootstrap.define("qx.bom.rest.Resource",
}

var handlerId = this.__longPollHandlers[action] =
this.addListener(action + "Success", function longPollHandler() {
this.on(action + "Success", function longPollHandler() {
if (res.isDisposed()) {
return;
}
Expand Down Expand Up @@ -1020,7 +1020,7 @@ qx.Bootstrap.define("qx.bom.rest.Resource",
if (this.__longPollHandlers) {
for (action in this.__longPollHandlers) {
var id = this.__longPollHandlers[action];
this.removeListenerById(id);
this.offById(id);
}
}

Expand Down
197 changes: 0 additions & 197 deletions framework/source/class/qx/test/bom/Blocker.js

This file was deleted.

0 comments on commit 7771818

Please sign in to comment.