Johannes Zellner 11 лет назад
Родитель
Сommit
10f059d9a3
3 измененных файлов с 25 добавлено и 7 удалено
  1. 12 6
      chrome_extension/popup.js
  2. 10 0
      frontend/js/core.js
  3. 3 1
      frontend/js/main.js

+ 12 - 6
chrome_extension/popup.js

@@ -18,8 +18,10 @@ function getCurrentTabUrl(callback) {
 function tryToDetectSettings() {
     chrome.tabs.query(queryInfo, function(tabs) {
         chrome.tabs.executeScript(tabs[0].id, { file: 'detectapp.js' }, function (results) {
-            if (results[0] && results[0].addPostUrl) {
-                localStorage.settingsUrl = results[0].addPostUrl;
+            if (results[0] && results[0].origin && results[0].token) {
+                localStorage.origin = results[0].origin;
+                localStorage.token = results[0].token;
+                localStorage.title = results[0].title;
                 show('home');
             }
         });
@@ -29,7 +31,7 @@ function tryToDetectSettings() {
 tryToDetectSettings();
 
 document.addEventListener('DOMContentLoaded', function() {
-    if (!localStorage.settingsUrl) {
+    if (!localStorage.token) {
         show('setup');
     } else {
         show('main');
@@ -61,7 +63,9 @@ function show(view) {
 }
 
 function disconnectApp() {
-    delete localStorage.settingsUrl;
+    delete localStorage.origin;
+    delete localStorage.token;
+    delete localStorage.title;
     show('disconnected');
 }
 
@@ -69,8 +73,10 @@ function add() {
     show('busy');
 
     var http = new XMLHttpRequest();
+    var url = localStorage.origin + '/api/things?token=' + localStorage.token;
     var body = JSON.stringify({ content: document.getElementById('content').value });
-    http.open('POST', localStorage.settingsUrl, true);
+
+    http.open('POST', url, true);
 
     http.setRequestHeader('Content-type', 'application/json');
     http.setRequestHeader('Content-length', body.length);
@@ -79,7 +85,7 @@ function add() {
     http.onreadystatechange = function() {//Call a function when the state changes.
         if(http.readyState === 4) {
             if (http.status === 401) {
-                delete localStorage.settingsUrl;
+                delete localStorage.token;
                 show('setup');
                 return;
             }

+ 10 - 0
frontend/js/core.js

@@ -25,6 +25,14 @@ function url(path) {
     return g_server + path + '?token=' + g_token;
 }
 
+function origin() {
+    return g_server;
+}
+
+function token() {
+    return g_token;
+}
+
 function Thing(id, createdAt, tags, content, richContent) {
     this.id = id;
     this.createdAt = createdAt || 0;
@@ -231,6 +239,8 @@ module.exports = {
     loginFailed: function () {},
     onLogout: function () {},
     url: url,
+    origin: origin,
+    token: token,
     Thing: Thing,
     session: new SessionApi(),
     settings: new SettingsApi(),

+ 3 - 1
frontend/js/main.js

@@ -167,7 +167,9 @@ function refresh(search) {
 
         // add global object for browser extensions
         document.getElementById('guacamoly-settings-node').textContent = JSON.stringify({
-            addPostUrl: Core.url('/api/things')
+            origin: Core.origin(),
+            token: Core.token(),
+            title: Core.settings.data.title
         });
     });
 }