Merge pull request #105 from abranson/master

Missing JS API components.

3 files changed, 10 insertions, 1 deletions

diff --git a/daemon/jskitmanager.cpp b/daemon/jskitmanager.cpp
index a24ab10..018fcae 100644
--- a/daemon/jskitmanager.cpp
+++ b/daemon/jskitmanager.cpp
@@ -183,7 +183,10 @@ void JSKitManager::startJsApp()
     });
 
     // We try to invoke the callbacks even if script parsing resulted in error...
-    _jspebble->invokeCallbacks("ready");
+    QJSValue eventObj = _engine->newObject();
+    eventObj.setProperty("ready", _engine->toScriptValue(true));
+    eventObj.setProperty("type", "ready");
+    _jspebble->invokeCallbacks("ready", QJSValueList({eventObj}));
 }
 
 void JSKitManager::stopJsApp()
diff --git a/daemon/jskitobjects.cpp b/daemon/jskitobjects.cpp
index 481c077..7a62a9c 100644
--- a/daemon/jskitobjects.cpp
+++ b/daemon/jskitobjects.cpp
@@ -241,6 +241,11 @@ void JSKitConsole::log(const QString &msg)
     qCDebug(l) << msg;
 }
 
+void JSKitConsole::warn(const QString &msg)
+{
+    qCWarning(l) << msg;
+}
+
 JSKitLocalStorage::JSKitLocalStorage(const QUuid &uuid, QObject *parent)
     : QObject(parent), _storage(new QSettings(getStorageFileFor(uuid), QSettings::IniFormat, this))
 {
diff --git a/daemon/jskitobjects.h b/daemon/jskitobjects.h
index 2840a3b..7d52f02 100644
--- a/daemon/jskitobjects.h
+++ b/daemon/jskitobjects.h
@@ -61,6 +61,7 @@ public:
     explicit JSKitConsole(QObject *parent=0);
 
     Q_INVOKABLE void log(const QString &msg);
+    Q_INVOKABLE void warn(const QString &msg);
 };
 
 class JSKitLocalStorage : public QObject