From 95fc4e29bb2c3158c3a3f96a9732f16e55f54bb2 Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 23 Apr 2011 20:02:41 +0200 Subject: [PATCH] minor changes --- demos/calendar/js/calendar.js | 2 +- source/js/Ox.App.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demos/calendar/js/calendar.js b/demos/calendar/js/calendar.js index 1ef3c61e..54024bea 100644 --- a/demos/calendar/js/calendar.js +++ b/demos/calendar/js/calendar.js @@ -2,7 +2,7 @@ console.log('calling Ox.UI()') //console.log('Ox =', Ox) //console.log('Ox.UI =', Ox.UI) -Ox.UI({display: 'icon', theme: 'modern'}, function() { +Ox.UI({display: 'console', theme: 'modern'}, function() { console.log('running Ox.UI()') //console.log('Ox =', Ox) diff --git a/source/js/Ox.App.js b/source/js/Ox.App.js index 172299c4..74cd3594 100644 --- a/source/js/Ox.App.js +++ b/source/js/Ox.App.js @@ -12,9 +12,9 @@ Ox.App = (function() { /*** Ox.App Basic application instance that communicates with a JSON API. - The JSON API should support at least the following actions: + The JSON API must support at least the following actions: api returns all api methods - init returns {config: {...}, user: {...}} + init returns data (site, user, ...) Options timeout API timeout in msec type 'GET' or 'POST' @@ -38,7 +38,7 @@ Ox.App = (function() { }, options || {}), time: new Date() }, - that = Ox.Element(); + that = new Ox.Element({}, self); that.api = { api: function(callback) {