Merge branch 'develop' with directory structure changes.

olegskl · Jun 12, 2013 · 8ad7ee0 · 8ad7ee0
2 parents 59485ff + 33a7527
commit 8ad7ee0
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 39 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+extension.zip merge=theirs
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# <img src="/src/images/icon_48.png" align="absmiddle"> Invasive Kanji
+# <img src="/extension/images/icon_48.png" align="absmiddle"> Invasive Kanji
 
 "Invasive Kanji" is a free and open-source Google Chrome extension for people who lack motivation or time to learn Japanese. Once installed and enabled, this extension will *make* you study kanji and/or kana as you browse the Internet.
 
@@ -8,10 +8,10 @@ There are many features planned ahead. If you have suggestions or problems using
 
 ### Installation
 
-1. Download the [latest beta](https://github.com/olegskl/invasive-kanji/archive/master.zip) (recommended) or the [development version](https://github.com/olegskl/invasive-kanji/archive/develop.zip) of the repository.
+1. Download the [latest beta](https://github.com/olegskl/invasive-kanji/blob/master/extension.zip?raw=true) (recommended) or the [development version](https://github.com/olegskl/invasive-kanji/blob/develop/extension.zip?raw=true) of the repository.
 2. Unarchive the downloaded file to your preferred location (whichever suits you).
-3. Using Google Chrome browser, navigate to chrome://extensions/ and enable "Developer mode" in the upper right corner.
-4. Click on the <kbd>Load unpacked extension...</kbd> button, browse to the **src/** directory within the unarchived repository directory and confirm.
+3. Using **Google Chrome** browser, navigate to chrome://extensions/ and enable "Developer mode" in the upper right corner.
+4. Click on the <kbd>Load unpacked extension...</kbd> button, browse to the unarchived directory and confirm.
 
 If you have completed the above steps, the "options" page will open indicating successfull installation of the extension. Start browsing the Internet and learning Japanese at the same time.
 

diff --git a/datagen/dictionaries/kanjidic b/datagen/dictionaries/kanjidic
diff --git a/datagen/dictionaries/kanjidic.json b/datagen/dictionaries/kanjidic.json
diff --git a/datagen/settings-assembly.json b/datagen/settings-assembly.json
@@ -1,5 +1,5 @@
 {
-    "destinationFilePath": "../src/dictionary.json",
+    "destinationFilePath": "../extension/dictionary.json",
     "sources": [
         {
             "dictionaryName": "hiragana",

diff --git a/extension.zip b/extension.zip
diff --git a/src/background.js → extension/background.js b/src/background.js → extension/background.js
diff --git a/src/contentscript.js → extension/contentscript.js b/src/contentscript.js → extension/contentscript.js
diff --git a/src/contentstyle.css → extension/contentstyle.css b/src/contentstyle.css → extension/contentstyle.css
diff --git a/extension/dictionary.json b/extension/dictionary.json
diff --git a/src/framecontent.html → extension/framecontent.html b/src/framecontent.html → extension/framecontent.html
diff --git a/src/framescript.js → extension/framescript.js b/src/framescript.js → extension/framescript.js
diff --git a/src/framestyle.css → extension/framestyle.css b/src/framestyle.css → extension/framestyle.css
diff --git a/src/images/icon_128.png → extension/images/icon_128.png b/src/images/icon_128.png → extension/images/icon_128.png
diff --git a/src/images/icon_19.png → extension/images/icon_19.png b/src/images/icon_19.png → extension/images/icon_19.png
diff --git a/src/images/icon_48.png → extension/images/icon_48.png b/src/images/icon_48.png → extension/images/icon_48.png
diff --git a/src/manifest.json → extension/manifest.json b/src/manifest.json → extension/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Invasive kanji",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "manifest_version": 2,
     "description": "An invasive way to learn kanji.",
     "icons": {

diff --git a/src/options.css → extension/options.css b/src/options.css → extension/options.css
diff --git a/src/options.html → extension/options.html b/src/options.html → extension/options.html
diff --git a/src/options.js → extension/options.js b/src/options.js → extension/options.js
diff --git a/src/dictionary.json b/src/dictionary.json