From d479107eb57fb59915693f47772d6e48ddd8b30d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 29 May 2016 13:26:09 -0700
Subject: Cleanup

---
 ext/fg/js/api.js    |  8 ++++----
 ext/fg/js/client.js | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ext/fg/js')

diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
index ecd8dd36..5d060311 100644
--- a/ext/fg/js/api.js
+++ b/ext/fg/js/api.js
@@ -41,10 +41,10 @@ function bgGetState(callback) {
     bgSendMessage('getState', {}, callback);
 }
 
-function bgCanAddNotes(definitions, modes, callback) {
-    bgSendMessage('canAddNotes', {definitions, modes}, callback);
+function bgCanAddDefinitions(definitions, modes, callback) {
+    bgSendMessage('canAddDefinitions', {definitions, modes}, callback);
 }
 
-function bgAddNote(definition, mode, callback) {
-    bgSendMessage('addNote', {definition, mode}, callback);
+function bgAddDefinition(definition, mode, callback) {
+    bgSendMessage('addDefinition', {definition, mode}, callback);
 }
diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js
index 31cc29cc..ec2ea630 100644
--- a/ext/fg/js/client.js
+++ b/ext/fg/js/client.js
@@ -106,13 +106,13 @@ class Client {
                 range.setLength(length);
 
                 bgRenderText(
-                    {defs: definitions, root: this.fgRoot, options: this.options, sequence},
+                    {definitions, root: this.fgRoot, options: this.options, sequence},
                     'term-list.html',
                     (content) => {
                         this.definitions = definitions;
                         this.showPopup(range, content);
 
-                        bgCanAddNotes(definitions, ['vocabExp', 'vocabReading'], (states) => {
+                        bgCanAddDefinitions(definitions, ['vocab_kanji', 'vocab_kana'], (states) => {
                             if (states !== null) {
                                 states.forEach((state, index) => this.popup.sendMessage('setActionState', {index, state, sequence}));
                             }
@@ -158,7 +158,7 @@ class Client {
         const state = {};
         state[mode] = false;
 
-        bgAddNote(this.definitions[index], mode, (success) => {
+        bgAddDefinition(this.definitions[index], mode, (success) => {
             if (success) {
                 this.popup.sendMessage('setActionState', {index, state, sequence: this.sequence});
             } else {
@@ -171,13 +171,13 @@ class Client {
         bgFindKanji(kanji, (definitions) => {
             const sequence = ++this.sequence;
             bgRenderText(
-                {defs: definitions, root: this.fgRoot, options: this.options, sequence},
+                {definitions, root: this.fgRoot, options: this.options, sequence},
                 'kanji-list.html',
                 (content) => {
                     this.definitions = definitions;
                     this.popup.setContent(content, definitions);
 
-                    bgCanAddNotes(definitions, ['kanji'], (states) => {
+                    bgCanAddDefinitions(definitions, ['kanji'], (states) => {
                         if (states !== null) {
                             states.forEach((state, index) => this.popup.sendMessage('setActionState', {index, state, sequence}));
                         }
-- 
cgit v1.2.3