LP#1626157 Doc updates

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/README.adoc b/Open-ILS/src/eg2/README.adoc
index 5d1322a..263fff9 100644 (file)
--- a/Open-ILS/src/eg2/README.adoc
+++ b/Open-ILS/src/eg2/README.adoc
@@ -38,7 +38,7 @@ $ npm install
 
 [source,sh]
 ---------------------------------------------------------------------
-$ ng build --app eg --watch --deploy-url /eg2/ --base-href /eg2/ --output-path  ../../web/eg2/
+$ ng build --watch --deploy-url /eg2/ --base-href /eg2/ --output-path  ../../web/eg2/
 ---------------------------------------------------------------------
 
 * Production builds
@@ -46,7 +46,7 @@ $ ng build --app eg --watch --deploy-url /eg2/ --base-href /eg2/ --output-path
 
 [source,sh]
 ---------------------------------------------------------------------
-$ ng build --app eg --aot --prod --deploy-url /eg2/ --base-href /eg2/ --output-path  ../../web/eg2/
+$ ng build --aot --prod --deploy-url /eg2/ --base-href /eg2/ --output-path  ../../web/eg2/
 ---------------------------------------------------------------------
 
 === Link build files into place for ease of dev

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index b6a2ecb..2816c9a 100644 (file)
--- a/Open-ILS/src/eg2/package.json
+++ b/Open-ILS/src/eg2/package.json
@@ -21,12 +21,11 @@
     "@angular/platform-browser": "6.0.1",
     "@angular/platform-browser-dynamic": "6.0.1",
     "@angular/router": "6.0.1",
-    "@angular/upgrade": "6.0.1",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.5",
     "core-js": "^2.4.1",
-    "jquery": "^3.2.1",
     "ngx-cookie": "^2.0.1",
     "rxjs": "^6.1.0",
+    "rxjs-compat": "^6.1.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
@@ -36,9 +35,7 @@
     "@angular/language-service": "6.0.1",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
-    "@types/jquery": "^3.2.16",
     "@types/node": "~6.0.60",
-    "@types/xml2js": "^0.4.2",
     "codelyzer": "~3.2.0",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
@@ -49,7 +46,6 @@
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.1.2",
-    "rxjs-compat": "^6.1.0",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
     "typescript": "2.7.2"

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
index 4d6b4f3..8589d58 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
@@ -54,7 +54,7 @@ TODO focus search input
           <div *ngIf="idx > 0">
             <input type="text" class="form-control"
               [(ngModel)]="searchContext.query[idx]"
-              (keyup)="checkEnter($event)"
+              (keyup.enter)="formEnter()"
               placeholder="Query..."/>
           </div>
         </div>