MAID: minor fixes, added a space after word Error for error text on cards

This commit is contained in:
jason.wall 2017-08-23 19:41:32 -04:00
parent c3ddd41b48
commit 0bd82de4ac
6 changed files with 295 additions and 293 deletions

View File

@ -1,108 +1,108 @@
{ {
"version": "3.0.3", "version": "3.0.3",
"name": "dynamicbible", "name": "dynamicbible",
"author": "Jason Wall", "author": "Jason Wall",
"homepage": "http://dynamicbible.com/", "homepage": "http://dynamicbible.com/",
"private": true, "private": true,
"config": { "config": {
"ionic_source_map": "source-map" "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": {}
}, },
"platforms": [ "scripts": {
"android" "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"
]
}
}

View File

@ -1,5 +1,5 @@
<ion-item class="title passage-title" (swipe)="close()"> <ion-item class="title passage-title" (swipe)="close()">
<ion-icon name="book" item-left></ion-icon> <span *ngIf="data !== undefined"><span *ngIf="data.status === -1">Error:</span>{{data.ref}}</span> <ion-icon name="book" item-left></ion-icon> <span *ngIf="data !== undefined"><span *ngIf="data.status === -1">Error:</span> {{data.ref}}</span>
<button ion-button icon-only item-end large clear (click)="close()"> <button ion-button icon-only item-end large clear (click)="close()">
<ion-icon name="close-circle"></ion-icon> <ion-icon name="close-circle"></ion-icon>
</button> </button>

View File

@ -90,7 +90,7 @@ export class Passage implements OnInit
this.ref = new Reference(data.ref); this.ref = new Reference(data.ref);
}); });
} }
expand() expand()
{ {
let last_verse_for_end = this.ref.Section.end.book.chapters[parseInt(this.ref.Section.end.chapter)]; let last_verse_for_end = this.ref.Section.end.book.chapters[parseInt(this.ref.Section.end.chapter)];

View File

@ -1,7 +1,7 @@
<ion-header> <ion-header>
<ion-toolbar> <ion-toolbar>
<ion-title> <ion-title>
<ion-icon name="paper" item-left></ion-icon> <span *ngIf="item !== undefined"><span *ngIf="item.status === -1">Error:</span>Strongs: {{item.prefix}}{{item.sn}}</span> <ion-icon name="paper" item-left></ion-icon> <span *ngIf="item !== undefined"><span *ngIf="item.status === -1">Error:</span> Strongs: {{item.prefix}}{{item.sn}}</span>
</ion-title> </ion-title>
<ion-buttons start> <ion-buttons start>
<button ion-button (click)="dismiss()" large> <button ion-button (click)="dismiss()" large>
@ -40,4 +40,4 @@
</ion-content> </ion-content>
<ion-content *ngIf="item !== undefined && item.status === -1"> <ion-content *ngIf="item !== undefined && item.status === -1">
<error-message [msg]="item.msg"></error-message> <error-message [msg]="item.msg"></error-message>
</ion-content> </ion-content>

View File

@ -1,5 +1,5 @@
<ion-item class="title strongs-title" padding (swipe)="close()"> <ion-item class="title strongs-title" padding (swipe)="close()">
<ion-icon name="paper" item-left></ion-icon> <span *ngIf="data !== undefined"><span *ngIf="data.status === -1">Error:</span>{{data.prefix}}{{data.sn}}</span> <ion-icon name="paper" item-left></ion-icon> <span *ngIf="data !== undefined"><span *ngIf="data.status === -1">Error:</span> {{data.prefix}}{{data.sn}}</span>
<button ion-button icon-only item-end large clear (click)="close()"> <button ion-button icon-only item-end large clear (click)="close()">
<ion-icon name="close-circle"></ion-icon> <ion-icon name="close-circle"></ion-icon>
</button> </button>

View File

@ -1,5 +1,5 @@
/// <reference path="../../typings/globals/jquery/index.d.ts" /> /// <reference path="../../typings/globals/jquery/index.d.ts" />
import {stemmer } from '../libs/Stemmer'; import { stemmer } from '../libs/Stemmer';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http } from '@angular/http'; 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 + '.' }; return { word: qry, refs: [], status: -1, msg: 'No passages found for query: ' + qry + '.' };
let shared: string[]; let shared: string[];
if (results.length === 1) { if (results.length === 1)
{
shared = results[0]; shared = results[0];
} }
else { else
{
shared = this.findSharedSet(results); shared = this.findSharedSet(results);
} }
@ -114,185 +116,185 @@ export class WordService
{ {
let words = new Array(); let words = new Array();
words.unshift('abishur'); words.unshift('abishur');
words.unshift('achor'); words.unshift('achor');
words.unshift('adoni'); words.unshift('adoni');
words.unshift('afterward'); words.unshift('afterward');
words.unshift('ahishahar'); words.unshift('ahishahar');
words.unshift('alleg'); words.unshift('alleg');
words.unshift('ambush'); words.unshift('ambush');
words.unshift('ancestor'); words.unshift('ancestor');
words.unshift('aphik'); words.unshift('aphik');
words.unshift('arbah'); words.unshift('arbah');
words.unshift('arodi'); words.unshift('arodi');
words.unshift('ashkenaz'); words.unshift('ashkenaz');
words.unshift('ate'); words.unshift('ate');
words.unshift('azaniah'); words.unshift('azaniah');
words.unshift('backbiteth'); words.unshift('backbiteth');
words.unshift('barbarian'); words.unshift('barbarian');
words.unshift('beard'); words.unshift('beard');
words.unshift('begettest'); words.unshift('begettest');
words.unshift('benefactor'); words.unshift('benefactor');
words.unshift('bethel'); words.unshift('bethel');
words.unshift('bilshan'); words.unshift('bilshan');
words.unshift('blindeth'); words.unshift('blindeth');
words.unshift('booti'); words.unshift('booti');
words.unshift('breaketh'); words.unshift('breaketh');
words.unshift('bucket'); words.unshift('bucket');
words.unshift('cabbon'); words.unshift('cabbon');
words.unshift('caphtor'); words.unshift('caphtor');
words.unshift('causeless'); words.unshift('causeless');
words.unshift('chapmen'); words.unshift('chapmen');
words.unshift('chese'); words.unshift('chese');
words.unshift('chrysoprasus'); words.unshift('chrysoprasus');
words.unshift('cloth'); words.unshift('cloth');
words.unshift('common'); words.unshift('common');
words.unshift('confess'); words.unshift('confess');
words.unshift('contendeth'); words.unshift('contendeth');
words.unshift('coucheth'); words.unshift('coucheth');
words.unshift('crept'); words.unshift('crept');
words.unshift('curseth'); words.unshift('curseth');
words.unshift('darius'); words.unshift('darius');
words.unshift('decketh'); words.unshift('decketh');
words.unshift('dema'); words.unshift('dema');
words.unshift('devil'); words.unshift('devil');
words.unshift('directeth'); words.unshift('directeth');
words.unshift('disposit'); words.unshift('disposit');
words.unshift('doth'); words.unshift('doth');
words.unshift('drowsi'); words.unshift('drowsi');
words.unshift('ebe'); words.unshift('ebe');
words.unshift('elead'); words.unshift('elead');
words.unshift('elkoshit'); words.unshift('elkoshit');
words.unshift('encourag'); words.unshift('encourag');
words.unshift('entreat'); words.unshift('entreat');
words.unshift('eschew'); words.unshift('eschew');
words.unshift('ever'); words.unshift('ever');
words.unshift('expert'); words.unshift('expert');
words.unshift('fallest'); words.unshift('fallest');
words.unshift('feedeth'); words.unshift('feedeth');
words.unshift('filthi'); words.unshift('filthi');
words.unshift('fleeth'); words.unshift('fleeth');
words.unshift('forborn'); words.unshift('forborn');
words.unshift('forsookest'); words.unshift('forsookest');
words.unshift('fretteth'); words.unshift('fretteth');
words.unshift('gahar'); words.unshift('gahar');
words.unshift('gazzam'); words.unshift('gazzam');
words.unshift('gibea'); words.unshift('gibea');
words.unshift('glister'); words.unshift('glister');
words.unshift('got'); words.unshift('got');
words.unshift('grope'); words.unshift('grope');
words.unshift('hadlai'); words.unshift('hadlai');
words.unshift('hammon'); words.unshift('hammon');
words.unshift('harbona'); words.unshift('harbona');
words.unshift('hasrah'); words.unshift('hasrah');
words.unshift('hazezon'); words.unshift('hazezon');
words.unshift('heinous'); words.unshift('heinous');
words.unshift('herebi'); words.unshift('herebi');
words.unshift('highest'); words.unshift('highest');
words.unshift('holdeth'); words.unshift('holdeth');
words.unshift('hosanna'); words.unshift('hosanna');
words.unshift('huri'); words.unshift('huri');
words.unshift('ill'); words.unshift('ill');
words.unshift('inexcus'); words.unshift('inexcus');
words.unshift('intend'); words.unshift('intend');
words.unshift('ishui'); words.unshift('ishui');
words.unshift('jaazaniah'); words.unshift('jaazaniah');
words.unshift('jaminit'); words.unshift('jaminit');
words.unshift('jecoliah'); words.unshift('jecoliah');
words.unshift('jeopard'); words.unshift('jeopard');
words.unshift('jethro'); words.unshift('jethro');
words.unshift('joiarib'); words.unshift('joiarib');
words.unshift('juda'); words.unshift('juda');
words.unshift('kelaiah'); words.unshift('kelaiah');
words.unshift('kishion'); words.unshift('kishion');
words.unshift('laden'); words.unshift('laden');
words.unshift('laughter'); words.unshift('laughter');
words.unshift('lehi'); words.unshift('lehi');
words.unshift('lift'); words.unshift('lift');
words.unshift('loatheth'); words.unshift('loatheth');
words.unshift('lucius'); words.unshift('lucius');
words.unshift('madmen'); words.unshift('madmen');
words.unshift('malachi'); words.unshift('malachi');
words.unshift('march'); words.unshift('march');
words.unshift('maul'); words.unshift('maul');
words.unshift('melchizedek'); words.unshift('melchizedek');
words.unshift('merrili'); words.unshift('merrili');
words.unshift('midianit'); words.unshift('midianit');
words.unshift('miri'); words.unshift('miri');
words.unshift('modest'); words.unshift('modest');
words.unshift('move'); words.unshift('move');
words.unshift('naashon'); words.unshift('naashon');
words.unshift('nazareth'); words.unshift('nazareth');
words.unshift('nephishesim'); words.unshift('nephishesim');
words.unshift('nisan'); words.unshift('nisan');
words.unshift('obadiah'); words.unshift('obadiah');
words.unshift('oliveyard'); words.unshift('oliveyard');
words.unshift('oren'); words.unshift('oren');
words.unshift('overrun'); words.unshift('overrun');
words.unshift('pallu'); words.unshift('pallu');
words.unshift('pas'); words.unshift('pas');
words.unshift('peel'); words.unshift('peel');
words.unshift('pernici'); words.unshift('pernici');
words.unshift('philip'); words.unshift('philip');
words.unshift('pison'); words.unshift('pison');
words.unshift('plucketh'); words.unshift('plucketh');
words.unshift('pour'); words.unshift('pour');
words.unshift('price'); words.unshift('price');
words.unshift('proport'); words.unshift('proport');
words.unshift('purg'); words.unshift('purg');
words.unshift('rabboni'); words.unshift('rabboni');
words.unshift('ravish'); words.unshift('ravish');
words.unshift('redeemedst'); words.unshift('redeemedst');
words.unshift('remainest'); words.unshift('remainest');
words.unshift('reput'); words.unshift('reput');
words.unshift('revers'); words.unshift('revers');
words.unshift('rissah'); words.unshift('rissah');
words.unshift('ruddi'); words.unshift('ruddi');
words.unshift('said'); words.unshift('said');
words.unshift('sapphir'); words.unshift('sapphir');
words.unshift('scepter'); words.unshift('scepter');
words.unshift('secundus'); words.unshift('secundus');
words.unshift('separ'); words.unshift('separ');
words.unshift('shachia'); words.unshift('shachia');
words.unshift('sharar'); words.unshift('sharar');
words.unshift('sheepshear'); words.unshift('sheepshear');
words.unshift('sheva'); words.unshift('sheva');
words.unshift('shishak'); words.unshift('shishak');
words.unshift('shroud'); words.unshift('shroud');
words.unshift('signifi'); words.unshift('signifi');
words.unshift('sittest'); words.unshift('sittest');
words.unshift('slow'); words.unshift('slow');
words.unshift('soft'); words.unshift('soft');
words.unshift('sowedst'); words.unshift('sowedst');
words.unshift('spoil'); words.unshift('spoil');
words.unshift('station'); words.unshift('station');
words.unshift('stoop'); words.unshift('stoop');
words.unshift('strongest'); words.unshift('strongest');
words.unshift('sum'); words.unshift('sum');
words.unshift('sweep'); words.unshift('sweep');
words.unshift('tahapan'); words.unshift('tahapan');
words.unshift('tast'); words.unshift('tast');
words.unshift('ten'); words.unshift('ten');
words.unshift('thereat'); words.unshift('thereat');
words.unshift('threaten'); words.unshift('threaten');
words.unshift('timbrel'); words.unshift('timbrel');
words.unshift('tongu'); words.unshift('tongu');
words.unshift('travailest'); words.unshift('travailest');
words.unshift('trust'); words.unshift('trust');
words.unshift('uncircumcis'); words.unshift('uncircumcis');
words.unshift('unprepar'); words.unshift('unprepar');
words.unshift('urg'); words.unshift('urg');
words.unshift('vat'); words.unshift('vat');
words.unshift('visiteth'); words.unshift('visiteth');
words.unshift('wash'); words.unshift('wash');
words.unshift('wed'); words.unshift('wed');
words.unshift('wherewith'); words.unshift('wherewith');
words.unshift('winepress'); words.unshift('winepress');
words.unshift('won'); words.unshift('won');
words.unshift('written'); words.unshift('written');
words.unshift('zalmonah'); words.unshift('zalmonah');
words.unshift('zenan'); words.unshift('zenan');
words.unshift('ziphim'); words.unshift('ziphim');
words.unshift('zuzim'); words.unshift('zuzim');
return words; return words;
} }