diff --git a/src/js/lib/ajax.js b/src/js/lib/ajax.js index 75663388..2aa47be1 100644 --- a/src/js/lib/ajax.js +++ b/src/js/lib/ajax.js @@ -92,7 +92,8 @@ var ajax = function(opt, success, failure) { req.onreadystatechange = function(e) { if (req.readyState === 4) { var body = req.responseText; - var okay = req.status === 200; + var okay = req.status >= 200 && req.status < 300 || req.status === 304; + try { if (opt.type === 'json') { body = JSON.parse(body); diff --git a/src/js/ui/simply-pebble.js b/src/js/ui/simply-pebble.js index 1a3aa95e..92ffe356 100644 --- a/src/js/ui/simply-pebble.js +++ b/src/js/ui/simply-pebble.js @@ -680,8 +680,11 @@ SimplyPebble.windowHide = function(id) { SimplyPebble.sendPacket(WindowHidePacket.id(id)); }; -SimplyPebble.windowProps = function(def) { - SimplyPebble.sendPacket(WindowPropsPacket.prop(def)); +SimplyPebble.windowProps = function(def, backgroundColor) { + WindowPropsPacket + .prop(def) + .backgroundColor(backgroundColor); + SimplyPebble.sendPacket(WindowPropsPacket); }; SimplyPebble.windowButtonConfig = function(def) { @@ -746,7 +749,7 @@ SimplyPebble.card = function(def, clear, pushing) { if (clear !== undefined) { SimplyPebble.cardClear(clear); } - SimplyPebble.windowProps(def); + SimplyPebble.windowProps(def, 'white'); if (def.action !== undefined) { SimplyPebble.windowActionBar(def.action); } diff --git a/src/js/ui/text.js b/src/js/ui/text.js index 832bd85f..5b7864f8 100644 --- a/src/js/ui/text.js +++ b/src/js/ui/text.js @@ -16,6 +16,7 @@ var defaults = { backgroundColor: 'clear', borderColor: 'clear', color: 'white', + font: 'gothic-24', }; var Text = function(elementDef) {