From 0bd82de4ac0c6025d85295c53a7a0e4359d27613 Mon Sep 17 00:00:00 2001 From: "jason.wall" Date: Wed, 23 Aug 2017 19:41:32 -0400 Subject: [PATCH] MAID: minor fixes, added a space after word Error for error text on cards --- DynamicBibleIonic/package.json | 212 +++++----- .../src/components/passage/passage.html | 2 +- .../src/components/passage/passage.ts | 2 +- .../strongs-modal/strongs-modal.html | 4 +- .../src/components/strongs/strongs.html | 2 +- .../src/services/word-service.ts | 366 +++++++++--------- 6 files changed, 295 insertions(+), 293 deletions(-) diff --git a/DynamicBibleIonic/package.json b/DynamicBibleIonic/package.json index 5250db71..7062525a 100644 --- a/DynamicBibleIonic/package.json +++ b/DynamicBibleIonic/package.json @@ -1,108 +1,108 @@ { - "version": "3.0.3", - "name": "dynamicbible", - "author": "Jason Wall", - "homepage": "http://dynamicbible.com/", - "private": true, - "config": { - "ionic_source_map": "source-map" - }, - "scripts": { - "clean": "ionic-app-scripts clean", - "build": "ionic-app-scripts build", - "lint": "ionic-app-scripts lint", - "ionic:build": "ionic-app-scripts build", - "ionic:serve": "ionic-app-scripts serve", - "start": "ionic serve", - "lab": "ionic serve --lab", - "test": "ng test", - "test-coverage": "ng test --code-coverage" - }, - "dependencies": { - "@angular/cli": "1.3.1", - "@angular/common": "4.1.3", - "@angular/compiler": "4.1.3", - "@angular/compiler-cli": "4.1.3", - "@angular/core": "4.1.3", - "@angular/forms": "4.1.3", - "@angular/http": "4.1.3", - "@angular/platform-browser": "4.1.3", - "@angular/platform-browser-dynamic": "4.1.3", - "@ionic-native/core": "3.12.1", - "@ionic-native/splash-screen": "3.12.1", - "@ionic-native/status-bar": "3.12.1", - "@ionic/storage": "2.0.1", - "cordova-android": "^6.2.3", - "cordova-plugin-console": "^1.0.5", - "cordova-plugin-crosswalk-webview": "^2.3.0", - "cordova-plugin-device": "^1.1.4", - "cordova-plugin-splashscreen": "^4.0.3", - "cordova-plugin-statusbar": "^2.2.3", - "cordova-plugin-whitelist": "^1.3.1", - "ionic-angular": "3.6.0", - "ionic-plugin-keyboard": "^2.2.1", - "ionicons": "3.0.0", - "rxjs": "5.4.0", - "sw-toolbox": "3.6.0", - "zone.js": "0.8.12" - }, - "devDependencies": { - "@angular/cli": "1.1.2", - "@ionic/app-scripts": "2.1.0", - "@types/jasmine": "2.5.41", - "@types/node": "7.0.4", - "codecov": "2.2.0", - "connect": "3.6.2", - "ionic-mocks": "0.10.1", - "jasmine-core": "2.6.2", - "jasmine-reporters": "2.2.1", - "karma": "1.7.0", - "karma-chrome-launcher": "2.1.1", - "karma-cli": "1.0.1", - "karma-coverage-istanbul-reporter": "1.2.1", - "karma-jasmine": "1.1.0", - "karma-jasmine-html-reporter": "0.2.2", - "karma-junit-reporter": "1.2.0", - "protractor": "5.1.2", - "serve-static": "1.12.3", - "ts-node": "3.0.4", - "tslint": "5.3.2", - "tslint-eslint-rules": "4.1.1", - "typescript": "2.3.4" - }, - "cordovaPlugins": [ - "cordova-plugin-whitelist", - "cordova-plugin-statusbar", - "cordova-plugin-console", - "cordova-plugin-device", - "cordova-plugin-splashscreen", - "ionic-plugin-keyboard" - ], - "cordovaPlatforms": [], - "description": "Dynamic Bible: A bible made for studying scripture", - "-vs-binding": { - "AfterBuild": [ - "ionic:serve" - ] - }, - "cordova": { - "plugins": { - "cordova-plugin-crosswalk-webview": { - "XWALK_VERSION": "22+", - "XWALK_LITEVERSION": "xwalk_core_library_canary:17+", - "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect", - "XWALK_MODE": "embedded", - "XWALK_MULTIPLEAPK": "true" - }, - "cordova-plugin-console": {}, - "cordova-plugin-device": {}, - "cordova-plugin-splashscreen": {}, - "cordova-plugin-statusbar": {}, - "cordova-plugin-whitelist": {}, - "ionic-plugin-keyboard": {} + "version": "3.0.3", + "name": "dynamicbible", + "author": "Jason Wall", + "homepage": "http://dynamicbible.com/", + "private": true, + "config": { + "ionic_source_map": "source-map" }, - "platforms": [ - "android" - ] - } -} + "scripts": { + "clean": "ionic-app-scripts clean", + "build": "ionic-app-scripts build", + "lint": "ionic-app-scripts lint", + "ionic:build": "ionic-app-scripts build", + "ionic:serve": "ionic-app-scripts serve", + "start": "ionic serve", + "lab": "ionic serve --lab", + "test": "ng test", + "test-coverage": "ng test --code-coverage" + }, + "dependencies": { + "@angular/cli": "1.3.1", + "@angular/common": "4.1.3", + "@angular/compiler": "4.1.3", + "@angular/compiler-cli": "4.1.3", + "@angular/core": "4.1.3", + "@angular/forms": "4.1.3", + "@angular/http": "4.1.3", + "@angular/platform-browser": "4.1.3", + "@angular/platform-browser-dynamic": "4.1.3", + "@ionic-native/core": "3.12.1", + "@ionic-native/splash-screen": "3.12.1", + "@ionic-native/status-bar": "3.12.1", + "@ionic/storage": "2.0.1", + "cordova-android": "^6.2.3", + "cordova-plugin-console": "^1.0.5", + "cordova-plugin-crosswalk-webview": "^2.3.0", + "cordova-plugin-device": "^1.1.4", + "cordova-plugin-splashscreen": "^4.0.3", + "cordova-plugin-statusbar": "^2.2.3", + "cordova-plugin-whitelist": "^1.3.1", + "ionic-angular": "3.6.0", + "ionic-plugin-keyboard": "^2.2.1", + "ionicons": "3.0.0", + "rxjs": "5.4.0", + "sw-toolbox": "3.6.0", + "zone.js": "0.8.12" + }, + "devDependencies": { + "@angular/cli": "1.1.2", + "@ionic/app-scripts": "2.1.0", + "@types/jasmine": "2.5.41", + "@types/node": "7.0.4", + "codecov": "2.2.0", + "connect": "3.6.2", + "ionic-mocks": "0.10.1", + "jasmine-core": "2.6.2", + "jasmine-reporters": "2.2.1", + "karma": "1.7.0", + "karma-chrome-launcher": "2.1.1", + "karma-cli": "1.0.1", + "karma-coverage-istanbul-reporter": "1.2.1", + "karma-jasmine": "1.1.0", + "karma-jasmine-html-reporter": "0.2.2", + "karma-junit-reporter": "1.2.0", + "protractor": "5.1.2", + "serve-static": "1.12.3", + "ts-node": "3.0.4", + "tslint": "5.3.2", + "tslint-eslint-rules": "4.1.1", + "typescript": "2.3.4" + }, + "cordovaPlugins": [ + "cordova-plugin-whitelist", + "cordova-plugin-statusbar", + "cordova-plugin-console", + "cordova-plugin-device", + "cordova-plugin-splashscreen", + "ionic-plugin-keyboard" + ], + "cordovaPlatforms": [], + "description": "Dynamic Bible: A bible made for studying scripture", + "-vs-binding": { + "AfterBuild": [ + "ionic:serve" + ] + }, + "cordova": { + "plugins": { + "cordova-plugin-crosswalk-webview": { + "XWALK_VERSION": "22+", + "XWALK_LITEVERSION": "xwalk_core_library_canary:17+", + "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect", + "XWALK_MODE": "embedded", + "XWALK_MULTIPLEAPK": "true" + }, + "cordova-plugin-console": {}, + "cordova-plugin-device": {}, + "cordova-plugin-splashscreen": {}, + "cordova-plugin-statusbar": {}, + "cordova-plugin-whitelist": {}, + "ionic-plugin-keyboard": {} + }, + "platforms": [ + "android" + ] + } +} \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/passage/passage.html b/DynamicBibleIonic/src/components/passage/passage.html index 5b909f06..b314d948 100644 --- a/DynamicBibleIonic/src/components/passage/passage.html +++ b/DynamicBibleIonic/src/components/passage/passage.html @@ -1,5 +1,5 @@ - Error:{{data.ref}} + Error: {{data.ref}} diff --git a/DynamicBibleIonic/src/components/passage/passage.ts b/DynamicBibleIonic/src/components/passage/passage.ts index 3bf8025e..b9d3a8d2 100644 --- a/DynamicBibleIonic/src/components/passage/passage.ts +++ b/DynamicBibleIonic/src/components/passage/passage.ts @@ -90,7 +90,7 @@ export class Passage implements OnInit this.ref = new Reference(data.ref); }); } - + expand() { let last_verse_for_end = this.ref.Section.end.book.chapters[parseInt(this.ref.Section.end.chapter)]; diff --git a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html index fa56b1e1..45e6125e 100644 --- a/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html +++ b/DynamicBibleIonic/src/components/strongs-modal/strongs-modal.html @@ -1,7 +1,7 @@ - Error:Strongs: {{item.prefix}}{{item.sn}} + Error: Strongs: {{item.prefix}}{{item.sn}} diff --git a/DynamicBibleIonic/src/services/word-service.ts b/DynamicBibleIonic/src/services/word-service.ts index 0fb5107d..79a72304 100644 --- a/DynamicBibleIonic/src/services/word-service.ts +++ b/DynamicBibleIonic/src/services/word-service.ts @@ -1,5 +1,5 @@ /// -import {stemmer } from '../libs/Stemmer'; +import { stemmer } from '../libs/Stemmer'; import { Injectable } from '@angular/core'; import { Http } from '@angular/http'; @@ -62,10 +62,12 @@ export class WordService return { word: qry, refs: [], status: -1, msg: 'No passages found for query: ' + qry + '.' }; let shared: string[]; - if (results.length === 1) { + if (results.length === 1) + { shared = results[0]; } - else { + else + { shared = this.findSharedSet(results); } @@ -114,185 +116,185 @@ export class WordService { let words = new Array(); words.unshift('abishur'); - words.unshift('achor'); - words.unshift('adoni'); - words.unshift('afterward'); - words.unshift('ahishahar'); - words.unshift('alleg'); - words.unshift('ambush'); - words.unshift('ancestor'); - words.unshift('aphik'); - words.unshift('arbah'); - words.unshift('arodi'); - words.unshift('ashkenaz'); - words.unshift('ate'); - words.unshift('azaniah'); - words.unshift('backbiteth'); - words.unshift('barbarian'); - words.unshift('beard'); - words.unshift('begettest'); - words.unshift('benefactor'); - words.unshift('bethel'); - words.unshift('bilshan'); - words.unshift('blindeth'); - words.unshift('booti'); - words.unshift('breaketh'); - words.unshift('bucket'); - words.unshift('cabbon'); - words.unshift('caphtor'); - words.unshift('causeless'); - words.unshift('chapmen'); - words.unshift('chese'); - words.unshift('chrysoprasus'); - words.unshift('cloth'); - words.unshift('common'); - words.unshift('confess'); - words.unshift('contendeth'); - words.unshift('coucheth'); - words.unshift('crept'); - words.unshift('curseth'); - words.unshift('darius'); - words.unshift('decketh'); - words.unshift('dema'); - words.unshift('devil'); - words.unshift('directeth'); - words.unshift('disposit'); - words.unshift('doth'); - words.unshift('drowsi'); - words.unshift('ebe'); - words.unshift('elead'); - words.unshift('elkoshit'); - words.unshift('encourag'); - words.unshift('entreat'); - words.unshift('eschew'); - words.unshift('ever'); - words.unshift('expert'); - words.unshift('fallest'); - words.unshift('feedeth'); - words.unshift('filthi'); - words.unshift('fleeth'); - words.unshift('forborn'); - words.unshift('forsookest'); - words.unshift('fretteth'); - words.unshift('gahar'); - words.unshift('gazzam'); - words.unshift('gibea'); - words.unshift('glister'); - words.unshift('got'); - words.unshift('grope'); - words.unshift('hadlai'); - words.unshift('hammon'); - words.unshift('harbona'); - words.unshift('hasrah'); - words.unshift('hazezon'); - words.unshift('heinous'); - words.unshift('herebi'); - words.unshift('highest'); - words.unshift('holdeth'); - words.unshift('hosanna'); - words.unshift('huri'); - words.unshift('ill'); - words.unshift('inexcus'); - words.unshift('intend'); - words.unshift('ishui'); - words.unshift('jaazaniah'); - words.unshift('jaminit'); - words.unshift('jecoliah'); - words.unshift('jeopard'); - words.unshift('jethro'); - words.unshift('joiarib'); - words.unshift('juda'); - words.unshift('kelaiah'); - words.unshift('kishion'); - words.unshift('laden'); - words.unshift('laughter'); - words.unshift('lehi'); - words.unshift('lift'); - words.unshift('loatheth'); - words.unshift('lucius'); - words.unshift('madmen'); - words.unshift('malachi'); - words.unshift('march'); - words.unshift('maul'); - words.unshift('melchizedek'); - words.unshift('merrili'); - words.unshift('midianit'); - words.unshift('miri'); - words.unshift('modest'); - words.unshift('move'); - words.unshift('naashon'); - words.unshift('nazareth'); - words.unshift('nephishesim'); - words.unshift('nisan'); - words.unshift('obadiah'); - words.unshift('oliveyard'); - words.unshift('oren'); - words.unshift('overrun'); - words.unshift('pallu'); - words.unshift('pas'); - words.unshift('peel'); - words.unshift('pernici'); - words.unshift('philip'); - words.unshift('pison'); - words.unshift('plucketh'); - words.unshift('pour'); - words.unshift('price'); - words.unshift('proport'); - words.unshift('purg'); - words.unshift('rabboni'); - words.unshift('ravish'); - words.unshift('redeemedst'); - words.unshift('remainest'); - words.unshift('reput'); - words.unshift('revers'); - words.unshift('rissah'); - words.unshift('ruddi'); - words.unshift('said'); - words.unshift('sapphir'); - words.unshift('scepter'); - words.unshift('secundus'); - words.unshift('separ'); - words.unshift('shachia'); - words.unshift('sharar'); - words.unshift('sheepshear'); - words.unshift('sheva'); - words.unshift('shishak'); - words.unshift('shroud'); - words.unshift('signifi'); - words.unshift('sittest'); - words.unshift('slow'); - words.unshift('soft'); - words.unshift('sowedst'); - words.unshift('spoil'); - words.unshift('station'); - words.unshift('stoop'); - words.unshift('strongest'); - words.unshift('sum'); - words.unshift('sweep'); - words.unshift('tahapan'); - words.unshift('tast'); - words.unshift('ten'); - words.unshift('thereat'); - words.unshift('threaten'); - words.unshift('timbrel'); - words.unshift('tongu'); - words.unshift('travailest'); - words.unshift('trust'); - words.unshift('uncircumcis'); - words.unshift('unprepar'); - words.unshift('urg'); - words.unshift('vat'); - words.unshift('visiteth'); - words.unshift('wash'); - words.unshift('wed'); - words.unshift('wherewith'); - words.unshift('winepress'); - words.unshift('won'); - words.unshift('written'); - words.unshift('zalmonah'); - words.unshift('zenan'); - words.unshift('ziphim'); - words.unshift('zuzim'); + words.unshift('achor'); + words.unshift('adoni'); + words.unshift('afterward'); + words.unshift('ahishahar'); + words.unshift('alleg'); + words.unshift('ambush'); + words.unshift('ancestor'); + words.unshift('aphik'); + words.unshift('arbah'); + words.unshift('arodi'); + words.unshift('ashkenaz'); + words.unshift('ate'); + words.unshift('azaniah'); + words.unshift('backbiteth'); + words.unshift('barbarian'); + words.unshift('beard'); + words.unshift('begettest'); + words.unshift('benefactor'); + words.unshift('bethel'); + words.unshift('bilshan'); + words.unshift('blindeth'); + words.unshift('booti'); + words.unshift('breaketh'); + words.unshift('bucket'); + words.unshift('cabbon'); + words.unshift('caphtor'); + words.unshift('causeless'); + words.unshift('chapmen'); + words.unshift('chese'); + words.unshift('chrysoprasus'); + words.unshift('cloth'); + words.unshift('common'); + words.unshift('confess'); + words.unshift('contendeth'); + words.unshift('coucheth'); + words.unshift('crept'); + words.unshift('curseth'); + words.unshift('darius'); + words.unshift('decketh'); + words.unshift('dema'); + words.unshift('devil'); + words.unshift('directeth'); + words.unshift('disposit'); + words.unshift('doth'); + words.unshift('drowsi'); + words.unshift('ebe'); + words.unshift('elead'); + words.unshift('elkoshit'); + words.unshift('encourag'); + words.unshift('entreat'); + words.unshift('eschew'); + words.unshift('ever'); + words.unshift('expert'); + words.unshift('fallest'); + words.unshift('feedeth'); + words.unshift('filthi'); + words.unshift('fleeth'); + words.unshift('forborn'); + words.unshift('forsookest'); + words.unshift('fretteth'); + words.unshift('gahar'); + words.unshift('gazzam'); + words.unshift('gibea'); + words.unshift('glister'); + words.unshift('got'); + words.unshift('grope'); + words.unshift('hadlai'); + words.unshift('hammon'); + words.unshift('harbona'); + words.unshift('hasrah'); + words.unshift('hazezon'); + words.unshift('heinous'); + words.unshift('herebi'); + words.unshift('highest'); + words.unshift('holdeth'); + words.unshift('hosanna'); + words.unshift('huri'); + words.unshift('ill'); + words.unshift('inexcus'); + words.unshift('intend'); + words.unshift('ishui'); + words.unshift('jaazaniah'); + words.unshift('jaminit'); + words.unshift('jecoliah'); + words.unshift('jeopard'); + words.unshift('jethro'); + words.unshift('joiarib'); + words.unshift('juda'); + words.unshift('kelaiah'); + words.unshift('kishion'); + words.unshift('laden'); + words.unshift('laughter'); + words.unshift('lehi'); + words.unshift('lift'); + words.unshift('loatheth'); + words.unshift('lucius'); + words.unshift('madmen'); + words.unshift('malachi'); + words.unshift('march'); + words.unshift('maul'); + words.unshift('melchizedek'); + words.unshift('merrili'); + words.unshift('midianit'); + words.unshift('miri'); + words.unshift('modest'); + words.unshift('move'); + words.unshift('naashon'); + words.unshift('nazareth'); + words.unshift('nephishesim'); + words.unshift('nisan'); + words.unshift('obadiah'); + words.unshift('oliveyard'); + words.unshift('oren'); + words.unshift('overrun'); + words.unshift('pallu'); + words.unshift('pas'); + words.unshift('peel'); + words.unshift('pernici'); + words.unshift('philip'); + words.unshift('pison'); + words.unshift('plucketh'); + words.unshift('pour'); + words.unshift('price'); + words.unshift('proport'); + words.unshift('purg'); + words.unshift('rabboni'); + words.unshift('ravish'); + words.unshift('redeemedst'); + words.unshift('remainest'); + words.unshift('reput'); + words.unshift('revers'); + words.unshift('rissah'); + words.unshift('ruddi'); + words.unshift('said'); + words.unshift('sapphir'); + words.unshift('scepter'); + words.unshift('secundus'); + words.unshift('separ'); + words.unshift('shachia'); + words.unshift('sharar'); + words.unshift('sheepshear'); + words.unshift('sheva'); + words.unshift('shishak'); + words.unshift('shroud'); + words.unshift('signifi'); + words.unshift('sittest'); + words.unshift('slow'); + words.unshift('soft'); + words.unshift('sowedst'); + words.unshift('spoil'); + words.unshift('station'); + words.unshift('stoop'); + words.unshift('strongest'); + words.unshift('sum'); + words.unshift('sweep'); + words.unshift('tahapan'); + words.unshift('tast'); + words.unshift('ten'); + words.unshift('thereat'); + words.unshift('threaten'); + words.unshift('timbrel'); + words.unshift('tongu'); + words.unshift('travailest'); + words.unshift('trust'); + words.unshift('uncircumcis'); + words.unshift('unprepar'); + words.unshift('urg'); + words.unshift('vat'); + words.unshift('visiteth'); + words.unshift('wash'); + words.unshift('wed'); + words.unshift('wherewith'); + words.unshift('winepress'); + words.unshift('won'); + words.unshift('written'); + words.unshift('zalmonah'); + words.unshift('zenan'); + words.unshift('ziphim'); + words.unshift('zuzim'); return words; }