Merge pull request #5 from krisklosterman/master

remove _app_base
nathangrove · Apr 10, 2017 · be7bbbb · be7bbbb
2 parents cdb62fd + 9b08fc5
commit be7bbbb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@angular/compiler-cli": "^2.3.1",
     "@types/jasmine": "2.5.38",
-    "@types/node": "^6.0.42",
+    "@types/node": "^6.0.66",
     "angular-cli": "1.0.0-beta.28.3",
     "codelyzer": "~2.0.0-beta.1",
     "colors": "^1.1.2",

diff --git a/snow-helpers/setup.js b/snow-helpers/setup.js
@@ -32,8 +32,7 @@ prompt.get({
     return;
   }
 
-  var c = result.confirm.toLowerCase();
-  if (c!='y' && c!='yes'){
+  if (!/^(yes|y)$/gi.test(result.confirm)){
     console.log('Exiting.');
     return;
   }

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -39,7 +39,7 @@ const appRoutes: Routes = [
   ],
   providers: [
     HttpClient,
-    { provide: APP_BASE_HREF, useValue: window['_app_base'] || '/' }
+    { provide: APP_BASE_HREF, useValue: '/' }
   ],
   bootstrap: [AppComponent]
 })

diff --git a/src/index.html b/src/index.html
@@ -10,7 +10,7 @@
       <title>Ng2snow</title>
 
     <!-- Init some variables 'n things. -->
-      <script>(function() { window['_app_base'] = window.location.pathname;window['_g_ck']="$[g_ck]";})()</script>
+      <script>(function() { window['_g_ck']="$[g_ck]";})()</script>
 
     <!-- bootstrap...why not use a CDN? Its so much easier-->
       <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous" />