From 6aa1bbc6c630ae5d8732a5dc8b01af01ef6cee21 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Sun, 1 May 2016 16:17:16 +0300
Subject: [PATCH 01/14] fix prepare_deploy fail

---
 build/prepare_deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/prepare_deploy.sh b/build/prepare_deploy.sh
index f180a36e..71a8562b 100755
--- a/build/prepare_deploy.sh
+++ b/build/prepare_deploy.sh
@@ -8,7 +8,7 @@ git reset --hard
 git fetch origin gh-pages:gh-pages
 git checkout gh-pages
 cp -R ../releases/* .
-git checkout master
+git checkout @{-1}
 cd -
 
 # build

From a272dacc956f077846b6b93a4f8a7481e2d30f2d Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Thu, 5 May 2016 11:05:02 +0300
Subject: [PATCH 02/14] Update angular to the rc

---
 lib/common/components/DropDown/dropdown.js    |  4 +-
 .../StickySidebar/sticky-sidebar.js           |  4 +-
 .../StickySidebar/sticky-sidebar.spec.js      |  6 +-
 lib/common/components/Tabs/tabs.js            |  4 +-
 lib/common/components/Tabs/tabs.spec.js       |  4 +-
 lib/common/components/Zippy/zippy.js          |  4 +-
 lib/common/components/Zippy/zippy.spec.js     |  4 +-
 lib/components/ApiInfo/api-info.spec.js       |  4 +-
 lib/components/ApiLogo/api-logo.spec.js       |  4 +-
 lib/components/JsonSchema/json-schema-lazy.js | 12 ++--
 .../JsonSchema/json-schema-lazy.spec.js       |  8 +--
 lib/components/JsonSchema/json-schema.js      |  2 +-
 lib/components/JsonSchema/json-schema.spec.js |  4 +-
 lib/components/Method/method.spec.js          |  6 +-
 .../MethodsList/methods-list.spec.js          |  6 +-
 lib/components/Redoc/redoc.js                 |  7 ++-
 lib/components/Redoc/redoc.spec.js            |  6 +-
 .../RequestSamples/request-samples.js         |  2 +-
 lib/components/SchemaSample/schema-sample.js  |  2 +-
 lib/components/SideMenu/side-menu.js          | 32 +++++------
 lib/components/SideMenu/side-menu.spec.js     |  6 +-
 lib/components/base.js                        |  4 +-
 lib/events.js                                 |  2 +-
 lib/options.js                                |  6 +-
 lib/utils/JsonFormatterPipe.js                |  4 +-
 lib/utils/pipes.js                            |  6 +-
 package.json                                  | 15 +++--
 system.config.js                              | 55 ++++++++++++++-----
 28 files changed, 127 insertions(+), 96 deletions(-)

diff --git a/lib/common/components/DropDown/dropdown.js b/lib/common/components/DropDown/dropdown.js
index 7ce695f4..1375b643 100644
--- a/lib/common/components/DropDown/dropdown.js
+++ b/lib/common/components/DropDown/dropdown.js
@@ -1,7 +1,7 @@
 'use strict';
 
-import {Component, EventEmitter, ElementRef} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
+import {Component, EventEmitter, ElementRef} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
 import DropKick from 'Robdel12/DropKick';
 import 'Robdel12/DropKick/build/css/dropkick.css!css';
 
diff --git a/lib/common/components/StickySidebar/sticky-sidebar.js b/lib/common/components/StickySidebar/sticky-sidebar.js
index 701204d1..65919173 100644
--- a/lib/common/components/StickySidebar/sticky-sidebar.js
+++ b/lib/common/components/StickySidebar/sticky-sidebar.js
@@ -1,7 +1,7 @@
 'use strict';
 
-import {Directive, ElementRef} from 'angular2/core';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Directive, ElementRef} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 @Directive({
   selector: '[sticky-sidebar]',
diff --git a/lib/common/components/StickySidebar/sticky-sidebar.spec.js b/lib/common/components/StickySidebar/sticky-sidebar.spec.js
index 58084d42..50cf4a36 100644
--- a/lib/common/components/StickySidebar/sticky-sidebar.spec.js
+++ b/lib/common/components/StickySidebar/sticky-sidebar.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElementByType } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Component, provide} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -10,7 +10,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import StickySidebar from 'lib/common/components/StickySidebar/sticky-sidebar';
 
diff --git a/lib/common/components/Tabs/tabs.js b/lib/common/components/Tabs/tabs.js
index d8b23da1..e620f926 100644
--- a/lib/common/components/Tabs/tabs.js
+++ b/lib/common/components/Tabs/tabs.js
@@ -1,7 +1,7 @@
 'use strict';
 
-import {Component, EventEmitter} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
+import {Component, EventEmitter} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
 
 @Component({
   selector: 'tabs',
diff --git a/lib/common/components/Tabs/tabs.spec.js b/lib/common/components/Tabs/tabs.spec.js
index dd8896f9..65f080c2 100644
--- a/lib/common/components/Tabs/tabs.spec.js
+++ b/lib/common/components/Tabs/tabs.spec.js
@@ -1,14 +1,14 @@
 'use strict';
 
 import { getChildDebugElement, getChildDebugElementAll } from 'tests/helpers';
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 
 import {
   TestComponentBuilder,
   inject,
   beforeEach,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import {Tabs, Tab} from 'lib/common/components/Tabs/tabs';
 
diff --git a/lib/common/components/Zippy/zippy.js b/lib/common/components/Zippy/zippy.js
index dda98d29..f6cd5519 100644
--- a/lib/common/components/Zippy/zippy.js
+++ b/lib/common/components/Zippy/zippy.js
@@ -1,7 +1,7 @@
 'use strict';
 
-import {Component, EventEmitter} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
+import {Component, EventEmitter} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
 
 @Component({
   selector: 'zippy',
diff --git a/lib/common/components/Zippy/zippy.spec.js b/lib/common/components/Zippy/zippy.spec.js
index 55c3a68f..e277eb68 100644
--- a/lib/common/components/Zippy/zippy.spec.js
+++ b/lib/common/components/Zippy/zippy.spec.js
@@ -1,14 +1,14 @@
 'use strict';
 
 import { getChildDebugElement, mouseclick } from 'tests/helpers';
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 
 import {
   TestComponentBuilder,
   inject,
   beforeEach,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import Zippy from 'lib/common/components/Zippy/zippy';
 
diff --git a/lib/components/ApiInfo/api-info.spec.js b/lib/components/ApiInfo/api-info.spec.js
index 87bcbc0e..6909a088 100644
--- a/lib/components/ApiInfo/api-info.spec.js
+++ b/lib/components/ApiInfo/api-info.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
+import {Component, provide} from '@angular/core';
 
 import {
   TestComponentBuilder,
@@ -10,7 +10,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import ApiInfo from 'lib/components/ApiInfo/api-info';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/ApiLogo/api-logo.spec.js b/lib/components/ApiLogo/api-logo.spec.js
index 946f36c8..dfb3a4c6 100644
--- a/lib/components/ApiLogo/api-logo.spec.js
+++ b/lib/components/ApiLogo/api-logo.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
+import {Component, provide} from '@angular/core';
 
 import {
   TestComponentBuilder,
@@ -10,7 +10,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import ApiLogo from 'lib/components/ApiLogo/api-logo';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/JsonSchema/json-schema-lazy.js b/lib/components/JsonSchema/json-schema-lazy.js
index 13457319..dd5a4b46 100644
--- a/lib/components/JsonSchema/json-schema-lazy.js
+++ b/lib/components/JsonSchema/json-schema-lazy.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import {Component, ElementRef, ViewContainerRef} from 'angular2/core';
-import {CORE_DIRECTIVES} from 'angular2/common';
-import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
+import {Component, ElementRef, ViewContainerRef} from '@angular/core';
+import {CORE_DIRECTIVES} from '@angular/common';
+import {DynamicComponentLoader} from '@angular/core';
 
 import JsonSchema from './json-schema';
 import OptionsManager from '../../options';
@@ -41,7 +41,7 @@ export default class JsonSchemaLazy {
       this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
         this.initComponent(compRef);
         // trigger change detection
-        compRef.hostView.changeDetectorRef.detectChanges();
+        compRef.changeDetectorRef.detectChanges();
       });
     }
     this.loaded = true;
@@ -60,7 +60,7 @@ export default class JsonSchemaLazy {
           if ($element.querySelector('.discriminator-wrap')) {
             this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
               this.initComponent(compRef);
-              compRef.hostView.changeDetectorRef.detectChanges();
+              compRef.changeDetectorRef.detectChanges();
             });
             return;
           }
@@ -70,7 +70,7 @@ export default class JsonSchemaLazy {
     } else {
       cache[this.pointer] = this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
         this.initComponent(compRef);
-        compRef.hostView.changeDetectorRef.detectChanges();
+        compRef.changeDetectorRef.detectChanges();
         return compRef;
       });
     }
diff --git a/lib/components/JsonSchema/json-schema-lazy.spec.js b/lib/components/JsonSchema/json-schema-lazy.spec.js
index debc622c..e8744b7e 100644
--- a/lib/components/JsonSchema/json-schema-lazy.spec.js
+++ b/lib/components/JsonSchema/json-schema-lazy.spec.js
@@ -1,9 +1,9 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
-import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Component, provide} from '@angular/core';
+import {DynamicComponentLoader} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -11,7 +11,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import JsonSchemaLazy from 'lib/components/JsonSchema/json-schema-lazy';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index 8ab92146..7445e7d3 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {ElementRef} from 'angular2/core';
+import {ElementRef} from '@angular/core';
 
 import {RedocComponent, BaseComponent, SchemaManager} from '../base';
 import {DropDown} from '../../common/components/DropDown/dropdown';
diff --git a/lib/components/JsonSchema/json-schema.spec.js b/lib/components/JsonSchema/json-schema.spec.js
index 50a4bcb6..6c7f2a3c 100644
--- a/lib/components/JsonSchema/json-schema.spec.js
+++ b/lib/components/JsonSchema/json-schema.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
+import {Component, provide} from '@angular/core';
 import OptionsManager from 'lib/options';
 
 import {
@@ -10,7 +10,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import JsonSchema from 'lib/components/JsonSchema/json-schema';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/Method/method.spec.js b/lib/components/Method/method.spec.js
index 89d5ad1b..b36b93e5 100644
--- a/lib/components/Method/method.spec.js
+++ b/lib/components/Method/method.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Component, provide} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -11,7 +11,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import Method from 'lib/components/Method/method';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/MethodsList/methods-list.spec.js b/lib/components/MethodsList/methods-list.spec.js
index 22cba67b..71ae31ea 100644
--- a/lib/components/MethodsList/methods-list.spec.js
+++ b/lib/components/MethodsList/methods-list.spec.js
@@ -1,9 +1,9 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from 'angular2/core';
+import {Component, provide} from '@angular/core';
 import OptionsManager from 'lib/options';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -12,7 +12,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import MethodsList from 'lib/components/MethodsList/methods-list';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index 3858d92e..139c995b 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -1,8 +1,9 @@
 'use strict';
 
-import {ChangeDetectionStrategy, provide, enableProdMode} from 'angular2/core';
-import {ElementRef} from 'angular2/core';
-import {BrowserDomAdapter, bootstrap} from 'angular2/platform/browser';
+import {ChangeDetectionStrategy, provide, enableProdMode} from '@angular/core';
+import {ElementRef} from '@angular/core';
+import {bootstrap} from '@angular/platform-browser-dynamic';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 import detectScollParent from 'scrollparent';
 import {RedocComponent, BaseComponent} from '../base';
 import SchemaManager from '../../utils/SchemaManager';
diff --git a/lib/components/Redoc/redoc.spec.js b/lib/components/Redoc/redoc.spec.js
index b6bcaac6..032ab8f0 100644
--- a/lib/components/Redoc/redoc.spec.js
+++ b/lib/components/Redoc/redoc.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, ViewMetadata, provide} from 'angular2/core';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Component, ViewMetadata, provide} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -11,7 +11,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import Redoc from 'lib/components/Redoc/redoc';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/RequestSamples/request-samples.js b/lib/components/RequestSamples/request-samples.js
index 032c0f98..ec8a542a 100644
--- a/lib/components/RequestSamples/request-samples.js
+++ b/lib/components/RequestSamples/request-samples.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {ViewChildren, QueryList, ChangeDetectorRef, ChangeDetectionStrategy} from 'angular2/core';
+import {ViewChildren, QueryList, ChangeDetectorRef, ChangeDetectionStrategy} from '@angular/core';
 
 import {RedocComponent, BaseComponent, SchemaManager} from '../base';
 import JsonPointer from '../../utils/JsonPointer';
diff --git a/lib/components/SchemaSample/schema-sample.js b/lib/components/SchemaSample/schema-sample.js
index c0555c60..21f5f09f 100644
--- a/lib/components/SchemaSample/schema-sample.js
+++ b/lib/components/SchemaSample/schema-sample.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {ElementRef} from 'angular2/core';
+import {ElementRef} from '@angular/core';
 
 import SchemaSampler from 'json-schema-instantiator';
 
diff --git a/lib/components/SideMenu/side-menu.js b/lib/components/SideMenu/side-menu.js
index d0d63042..5ab3ebaf 100644
--- a/lib/components/SideMenu/side-menu.js
+++ b/lib/components/SideMenu/side-menu.js
@@ -1,9 +1,8 @@
 'use strict';
 
-import {ChangeDetectorRef, ChangeDetectionStrategy, ElementRef} from 'angular2/core';
-import {document} from 'angular2/src/facade/browser';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
-import {global} from 'angular2/src/facade/lang';
+import {ElementRef} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import {global} from '@angular/core/src/facade/lang';
 
 import {RedocComponent, BaseComponent, SchemaManager} from '../base';
 import {redocEvents} from '../../events';
@@ -24,20 +23,18 @@ const INVIEW_POSITION = {
 @RedocComponent({
   selector: 'side-menu',
   templateUrl: './lib/components/SideMenu/side-menu.html',
-  styleUrls: ['./lib/components/SideMenu/side-menu.css'],
-  changeDetection: ChangeDetectionStrategy.Default
+  styleUrls: ['./lib/components/SideMenu/side-menu.css']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef],
-  [BrowserDomAdapter], [ChangeDetectorRef], [OptionsManager]])
+  [BrowserDomAdapter],  [OptionsManager]])
 export default class SideMenu extends BaseComponent {
-  constructor(schemaMgr, elementRef, dom, changeDetectorRef, optionsMgr) {
+  constructor(schemaMgr, elementRef, dom, optionsMgr) {
     super(schemaMgr);
     this.$element = elementRef.nativeElement;
-    this.changeDetector = changeDetectorRef;
     this.dom = dom;
     this.options = optionsMgr.options;
     this.$scrollParent = this.options.$scrollParent;
-    this.bindEvents();
+
     this.activeCatIdx = 0;
     this.activeMethodIdx = -1;
     this.prevOffsetY = null;
@@ -48,6 +45,14 @@ export default class SideMenu extends BaseComponent {
     this.activeItemCaption = '';
   }
 
+
+  init() {
+    this.bindEvents();
+    this.$mobileNav = this.dom.querySelector(this.$element, '.mobile-nav');
+    this.$resourcesNav = this.dom.querySelector(this.$element, '#resources-nav');
+    this.changeActive(CHANGE.INITIAL);
+  }
+
   scrollY() {
     return (this.$scrollParent.pageYOffset != null) ? this.$scrollParent.pageYOffset : this.$scrollParent.scrollTop;
   }
@@ -218,7 +223,6 @@ export default class SideMenu extends BaseComponent {
       }
       stable = true;
     }
-    this.changeDetector.detectChanges();
   }
 
   prepareModel() {
@@ -245,10 +249,4 @@ export default class SideMenu extends BaseComponent {
       dom.setStyle(this.$resourcesNav, 'height', height + 'px');
     }
   }
-
-  init() {
-    this.$mobileNav = this.dom.querySelector(this.$element, '.mobile-nav');
-    this.$resourcesNav = this.dom.querySelector(this.$element, '#resources-nav');
-    this.changeActive(CHANGE.INITIAL);
-  }
 }
diff --git a/lib/components/SideMenu/side-menu.spec.js b/lib/components/SideMenu/side-menu.spec.js
index 734ed847..04762365 100644
--- a/lib/components/SideMenu/side-menu.spec.js
+++ b/lib/components/SideMenu/side-menu.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElement, mouseclick} from 'tests/helpers';
-import {Component, provide, ViewMetadata} from 'angular2/core';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
+import {Component, provide, ViewMetadata} from '@angular/core';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 import OptionsManager from 'lib/options';
 
 import {
@@ -12,7 +12,7 @@ import {
   beforeEach,
   beforeEachProviders,
   it
-} from 'angular2/testing';
+} from '@angular/testing';
 
 import {redocEvents} from 'lib/events';
 import MethodsList from 'lib/components/MethodsList/methods-list';
diff --git a/lib/components/base.js b/lib/components/base.js
index 30facc9b..c3ee656f 100644
--- a/lib/components/base.js
+++ b/lib/components/base.js
@@ -1,6 +1,6 @@
 'use strict';
-import {Component, ChangeDetectionStrategy} from 'angular2/core';
-import {CORE_DIRECTIVES, JsonPipe, AsyncPipe} from 'angular2/common';
+import {Component, ChangeDetectionStrategy} from '@angular/core';
+import {CORE_DIRECTIVES, JsonPipe, AsyncPipe} from '@angular/common';
 import SchemaManager from '../utils/SchemaManager';
 import JsonPointer from '../utils/JsonPointer';
 import {MarkedPipe, JsonPointerEscapePipe} from '../utils/pipes';
diff --git a/lib/events.js b/lib/events.js
index 77b6a0de..2dcac54f 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {EventEmitter} from 'angular2/core';
+import {EventEmitter} from '@angular/core';
 
 var bootsrEmmiter = new EventEmitter();
 var langChanged = new EventEmitter();
diff --git a/lib/options.js b/lib/options.js
index d708b86c..3021c7cc 100644
--- a/lib/options.js
+++ b/lib/options.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import {isFunction, isString} from 'angular2/src/facade/lang';
-import {BrowserDomAdapter} from 'angular2/platform/browser';
-import {global} from 'angular2/src/facade/lang';
+import {isFunction, isString} from '@angular/core/src/facade/lang';
+import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import {global} from '@angular/core/src/facade/lang';
 
 var defaults = {
   scrollYOffset: 0,
diff --git a/lib/utils/JsonFormatterPipe.js b/lib/utils/JsonFormatterPipe.js
index 11971097..08208ab1 100644
--- a/lib/utils/JsonFormatterPipe.js
+++ b/lib/utils/JsonFormatterPipe.js
@@ -1,6 +1,6 @@
 'use strict';
-import {Pipe} from 'angular2/core';
-import {isBlank} from 'angular2/src/facade/lang';
+import {Pipe} from '@angular/core';
+import {isBlank} from '@angular/core/src/facade/lang';
 
 var level = 1;
 const COLLAPSE_LEVEL = 2;
diff --git a/lib/utils/pipes.js b/lib/utils/pipes.js
index 29940a77..fb30e0a9 100644
--- a/lib/utils/pipes.js
+++ b/lib/utils/pipes.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import {Pipe} from 'angular2/core';
-import {isString, stringify, isBlank} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {Pipe} from '@angular/core';
+import {isString, stringify, isBlank} from '@angular/core/src/facade/lang';
+import {BaseException} from '@angular/core/src/facade/exceptions';
 import {JsonPointer} from './JsonPointer';
 
 import Prism from '../../prismjs-bundle';
diff --git a/package.json b/package.json
index fbb37100..df404abb 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,13 @@
   "jspm": {
     "configFile": "system.config.js",
     "dependencies": {
+      "@angular/common": "npm:@angular/common@^2.0.0-rc.1",
+      "@angular/compiler": "npm:@angular/compiler@^2.0.0-rc.1",
+      "@angular/core": "npm:@angular/core@^2.0.0-rc.1",
+      "@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.1",
+      "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.1",
+      "@angular/platform-browser-dynamic-dynamic": "npm:@angular/platform-browser-dynamic-dynamic@^2.0.0-rc.1",
       "Robdel12/DropKick": "github:Robdel12/DropKick@^2.1.7",
-      "angular2": "npm:angular2@2.0.0-beta.17",
       "es6-shim": "github:es-shims/es6-shim@^0.33.6",
       "hint.css": "npm:hint.css@^2.2.1",
       "json": "github:systemjs/plugin-json@^0.1.0",
@@ -42,9 +47,11 @@
       "json-schema-instantiator": "npm:json-schema-instantiator@^0.3.0",
       "marked": "npm:marked@^0.3.5",
       "prismjs": "npm:prismjs@^1.3.0",
+      "rxjs": "npm:rxjs@5.0.0-beta.6",
       "scrollparent": "npm:scrollparent@^0.1.0",
       "stream-http": "npm:stream-http@^2.3.0",
-      "swagger-parser": "npm:swagger-parser@4.0.0-beta.2"
+      "swagger-parser": "npm:swagger-parser@4.0.0-beta.2",
+      "zone.js": "npm:zone.js@0.6.12"
     },
     "devDependencies": {
       "babel": "npm:babel-core@^5.8.34",
@@ -85,7 +92,7 @@
     "istanbul": "github:gotwarlost/istanbul#source-map",
     "jasmine-core": "^2.4.1",
     "jasmine-spec-reporter": "^2.4.0",
-    "jspm": "^0.16.19",
+    "jspm": "^0.16.34",
     "karma": "^0.13.15",
     "karma-babel-preprocessor": "^5.2.2",
     "karma-chrome-launcher": "^0.2.2",
@@ -106,7 +113,7 @@
     "run-sequence": "^1.1.5",
     "should": "^8.0.2",
     "sinon": "^1.17.2",
-    "systemjs-builder": "^0.15.2",
+    "systemjs-builder": "^0.15.16",
     "vinyl-paths": "^2.0.0",
     "zone.js": "^0.6.12"
   }
diff --git a/system.config.js b/system.config.js
index 8fb331e0..fae45007 100644
--- a/system.config.js
+++ b/system.config.js
@@ -29,16 +29,23 @@ System.config({
 
   meta: {
     "jspm_packages/npm/json-formatter-js@0.2.0/src/*": {
-      "format": "es6"
+      "format": "esm"
     },
     "jspm_packages/npm/json-schema-view-js@0.2.0/src/*": {
-      "format": "es6"
+      "format": "esm"
+    },
+    "npm:@angular/**/*": {
+      "format": "esm"
     }
   },
 
   map: {
+    "@angular/common": "npm:@angular/common@2.0.0-rc.1",
+    "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1",
+    "@angular/core": "npm:@angular/core@2.0.0-rc.1",
+    "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@2.0.0-rc.1",
     "Robdel12/DropKick": "github:Robdel12/DropKick@2.1.7",
-    "angular2": "npm:angular2@2.0.0-beta.17",
     "babel": "npm:babel-core@5.8.34",
     "babel-runtime": "npm:babel-runtime@5.8.34",
     "clean-css": "npm:clean-css@3.4.6",
@@ -52,10 +59,12 @@ System.config({
     "json-schema-instantiator": "npm:json-schema-instantiator@0.3.0",
     "marked": "npm:marked@0.3.5",
     "prismjs": "npm:prismjs@1.3.0",
+    "rxjs": "npm:rxjs@5.0.0-beta.6",
     "scrollparent": "npm:scrollparent@0.1.0",
     "stream-http": "npm:stream-http@2.3.0",
     "swagger-parser": "npm:swagger-parser@4.0.0-beta.2",
     "systemjs/plugin-json": "github:systemjs/plugin-json@0.1.2",
+    "zone.js": "npm:zone.js@0.6.12",
     "github:jspm/nodelibs-assert@0.1.0": {
       "assert": "npm:assert@1.3.0"
     },
@@ -131,17 +140,38 @@ System.config({
     "github:jspm/nodelibs-zlib@0.1.0": {
       "browserify-zlib": "npm:browserify-zlib@0.1.4"
     },
+    "npm:@angular/common@2.0.0-rc.1": {
+      "@angular/core": "npm:@angular/core@2.0.0-rc.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:@angular/compiler@2.0.0-rc.1": {
+      "@angular/core": "npm:@angular/core@2.0.0-rc.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:@angular/core@2.0.0-rc.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "rxjs": "npm:rxjs@5.0.0-beta.6",
+      "zone.js": "npm:zone.js@0.6.12"
+    },
+    "npm:@angular/platform-browser-dynamic@2.0.0-rc.1": {
+      "@angular/common": "npm:@angular/common@2.0.0-rc.1",
+      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1",
+      "@angular/core": "npm:@angular/core@2.0.0-rc.1",
+      "@angular/platform-browser": "npm:@angular/platform-browser@2.0.0-rc.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:@angular/platform-browser@2.0.0-rc.1": {
+      "@angular/common": "npm:@angular/common@2.0.0-rc.1",
+      "@angular/compiler": "npm:@angular/compiler@2.0.0-rc.1",
+      "@angular/core": "npm:@angular/core@2.0.0-rc.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
     "npm:amdefine@1.0.0": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "module": "github:jspm/nodelibs-module@0.1.0",
       "path": "github:jspm/nodelibs-path@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:angular2@2.0.0-beta.17": {
-      "reflect-metadata": "npm:reflect-metadata@0.1.2",
-      "rxjs": "npm:rxjs@5.0.0-beta.7",
-      "zone.js": "npm:zone.js@0.6.12"
-    },
     "npm:argparse@1.0.7": {
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "path": "github:jspm/nodelibs-path@0.1.0",
@@ -736,10 +766,6 @@ System.config({
       "string_decoder": "npm:string_decoder@0.10.31",
       "util-deprecate": "npm:util-deprecate@1.0.2"
     },
-    "npm:reflect-metadata@0.1.2": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
     "npm:request@2.72.0": {
       "aws-sign2": "npm:aws-sign2@0.6.0",
       "aws4": "npm:aws4@1.3.2",
@@ -778,10 +804,9 @@ System.config({
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
-    "npm:rxjs@5.0.0-beta.7": {
+    "npm:rxjs@5.0.0-beta.6": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "symbol-observable": "npm:symbol-observable@0.2.4"
+      "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:sha.js@2.4.5": {
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",

From d2eca9fcde54045b6a53617228e821c531519a93 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Fri, 6 May 2016 00:48:41 +0300
Subject: [PATCH 03/14] updated angular to rc + refactor

---
 build/tasks/build.js                          |  1 +
 lib/components/ApiInfo/api-info.js            |  2 +-
 lib/components/ApiInfo/api-info.scss          |  2 +-
 lib/components/ApiInfo/api-info.spec.js       |  7 +--
 lib/components/ApiLogo/api-logo.js            |  2 +-
 lib/components/ApiLogo/api-logo.scss          |  2 +-
 lib/components/ApiLogo/api-logo.spec.js       |  7 +--
 .../JsonSchema/json-schema-common.scss        |  2 +-
 lib/components/JsonSchema/json-schema-lazy.js |  4 +-
 .../JsonSchema/json-schema-lazy.spec.js       |  6 ++-
 lib/components/JsonSchema/json-schema.js      |  8 +--
 lib/components/JsonSchema/json-schema.spec.js |  5 +-
 lib/components/Method/method.html             |  2 +-
 lib/components/Method/method.js               | 26 +++++----
 lib/components/Method/method.scss             |  4 +-
 lib/components/Method/method.spec.js          |  7 +--
 lib/components/MethodsList/methods-list.js    |  8 +--
 lib/components/MethodsList/methods-list.scss  |  4 +-
 .../MethodsList/methods-list.spec.js          |  5 +-
 lib/components/ParamsList/params-list.js      |  7 ++-
 lib/components/ParamsList/params-list.scss    |  2 +-
 lib/components/Redoc/redoc.js                 | 40 ++++++++------
 lib/components/Redoc/redoc.scss               |  2 +-
 lib/components/Redoc/redoc.spec.js            |  5 +-
 .../RequestSamples/request-samples.html       |  6 +--
 .../RequestSamples/request-samples.js         | 47 ++++++++--------
 .../RequestSamples/request-samples.scss       |  2 +-
 .../ResponsesList/responses-list.js           |  7 ++-
 .../ResponsesList/responses-list.scss         |  2 +-
 .../ResponsesSamples/responses-samples.js     | 13 ++---
 .../ResponsesSamples/responses-samples.scss   |  2 +-
 lib/components/SchemaSample/schema-sample.js  |  8 +--
 .../SchemaSample/schema-sample.scss           |  2 +-
 lib/components/SideMenu/side-menu.html        |  4 +-
 lib/components/SideMenu/side-menu.js          | 20 +++----
 lib/components/SideMenu/side-menu.scss        |  2 +-
 lib/components/SideMenu/side-menu.spec.js     |  5 +-
 lib/components/base.js                        |  6 +--
 lib/components/index.js                       | 53 +++++--------------
 lib/events.js                                 | 10 ----
 lib/services/events.service.js                | 10 ++++
 lib/services/index.js                         |  3 ++
 .../components/DropDown/drop-down.js}         |  2 +-
 .../components/DropDown/drop-down.scss}       |  0
 .../StickySidebar/sticky-sidebar.js           |  2 +-
 .../StickySidebar/sticky-sidebar.spec.js      |  6 +--
 .../components/Tabs/tabs.js                   |  2 +-
 .../components/Tabs/tabs.scss                 |  0
 .../components/Tabs/tabs.spec.js              |  2 +-
 .../components/Zippy/zippy.html               |  0
 .../components/Zippy/zippy.js                 |  6 +--
 .../components/Zippy/zippy.scss               |  0
 .../components/Zippy/zippy.spec.js            |  4 +-
 lib/shared/components/index.js                |  5 ++
 .../styles/_share-link.scss                   |  0
 lib/{common => shared}/styles/_variables.scss |  0
 package.json                                  |  3 ++
 system.config.js                              |  1 -
 tests/helpers.js                              |  2 +-
 59 files changed, 204 insertions(+), 193 deletions(-)
 delete mode 100644 lib/events.js
 create mode 100644 lib/services/events.service.js
 create mode 100644 lib/services/index.js
 rename lib/{common/components/DropDown/dropdown.js => shared/components/DropDown/drop-down.js} (92%)
 rename lib/{common/components/DropDown/dropdown.scss => shared/components/DropDown/drop-down.scss} (100%)
 rename lib/{common => shared}/components/StickySidebar/sticky-sidebar.js (97%)
 rename lib/{common => shared}/components/StickySidebar/sticky-sidebar.spec.js (90%)
 rename lib/{common => shared}/components/Tabs/tabs.js (96%)
 rename lib/{common => shared}/components/Tabs/tabs.scss (100%)
 rename lib/{common => shared}/components/Tabs/tabs.spec.js (98%)
 rename lib/{common => shared}/components/Zippy/zippy.html (100%)
 rename lib/{common => shared}/components/Zippy/zippy.js (79%)
 rename lib/{common => shared}/components/Zippy/zippy.scss (100%)
 rename lib/{common => shared}/components/Zippy/zippy.spec.js (96%)
 create mode 100644 lib/shared/components/index.js
 rename lib/{common => shared}/styles/_share-link.scss (100%)
 rename lib/{common => shared}/styles/_variables.scss (100%)

diff --git a/build/tasks/build.js b/build/tasks/build.js
index 69fc44a9..5361d12c 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -41,6 +41,7 @@ gulp.task('inlineTemplates', ['sass'], function() {
 var JS_DEV_DEPS = [
   'lib/utils/browser-update.js',
   'node_modules/zone.js/dist/zone.js',
+  'node_modules/zone.js/dist/long-stack-trace-zone.js',
   'node_modules/reflect-metadata/Reflect.js',
   'node_modules/babel-polyfill/dist/polyfill.js'
 ];
diff --git a/lib/components/ApiInfo/api-info.js b/lib/components/ApiInfo/api-info.js
index 8fd9391c..336bbaf5 100644
--- a/lib/components/ApiInfo/api-info.js
+++ b/lib/components/ApiInfo/api-info.js
@@ -9,7 +9,7 @@ import OptionsManager from '../../options';
   templateUrl: './lib/components/ApiInfo/api-info.html'
 })
 @Reflect.metadata('parameters', [[SchemaManager], [OptionsManager]])
-export default class ApiInfo extends BaseComponent {
+export class ApiInfo extends BaseComponent {
   constructor(schemaMgr, optionsMgr) {
     super(schemaMgr);
     this.optionsMgr = optionsMgr;
diff --git a/lib/components/ApiInfo/api-info.scss b/lib/components/ApiInfo/api-info.scss
index b7e81ba2..762471b9 100644
--- a/lib/components/ApiInfo/api-info.scss
+++ b/lib/components/ApiInfo/api-info.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 .api-info-header {
   font-weight: normal;
diff --git a/lib/components/ApiInfo/api-info.spec.js b/lib/components/ApiInfo/api-info.spec.js
index 6909a088..d34fdae9 100644
--- a/lib/components/ApiInfo/api-info.spec.js
+++ b/lib/components/ApiInfo/api-info.spec.js
@@ -4,13 +4,14 @@ import { getChildDebugElement } from 'tests/helpers';
 import {Component, provide} from '@angular/core';
 
 import {
-  TestComponentBuilder,
-  async,
   inject,
+  async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import ApiInfo from 'lib/components/ApiInfo/api-info';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/ApiLogo/api-logo.js b/lib/components/ApiLogo/api-logo.js
index 46db79dd..dcf5a0bc 100644
--- a/lib/components/ApiLogo/api-logo.js
+++ b/lib/components/ApiLogo/api-logo.js
@@ -7,7 +7,7 @@ import {RedocComponent, BaseComponent} from '../base';
   styleUrls: ['./lib/components/ApiLogo/api-logo.css'],
   templateUrl: './lib/components/ApiLogo/api-logo.html'
 })
-export default class ApiLogo extends BaseComponent {
+export class ApiLogo extends BaseComponent {
   constructor(schemaMgr) {
     super(schemaMgr);
   }
diff --git a/lib/components/ApiLogo/api-logo.scss b/lib/components/ApiLogo/api-logo.scss
index 1e16b41e..7f78e62b 100644
--- a/lib/components/ApiLogo/api-logo.scss
+++ b/lib/components/ApiLogo/api-logo.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 img {
   max-height: 150px;
diff --git a/lib/components/ApiLogo/api-logo.spec.js b/lib/components/ApiLogo/api-logo.spec.js
index dfb3a4c6..dec6e5a3 100644
--- a/lib/components/ApiLogo/api-logo.spec.js
+++ b/lib/components/ApiLogo/api-logo.spec.js
@@ -4,13 +4,14 @@ import { getChildDebugElement } from 'tests/helpers';
 import {Component, provide} from '@angular/core';
 
 import {
-  TestComponentBuilder,
-  async,
   inject,
+  async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import ApiLogo from 'lib/components/ApiLogo/api-logo';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/JsonSchema/json-schema-common.scss b/lib/components/JsonSchema/json-schema-common.scss
index 4b2d2953..ddcb9656 100644
--- a/lib/components/JsonSchema/json-schema-common.scss
+++ b/lib/components/JsonSchema/json-schema-common.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 $lines-width: 1px;
 $bullet-size: 1px;
 $cell-spacing: 25px;
diff --git a/lib/components/JsonSchema/json-schema-lazy.js b/lib/components/JsonSchema/json-schema-lazy.js
index dd5a4b46..5f3e1cf7 100644
--- a/lib/components/JsonSchema/json-schema-lazy.js
+++ b/lib/components/JsonSchema/json-schema-lazy.js
@@ -4,7 +4,7 @@ import {Component, ElementRef, ViewContainerRef} from '@angular/core';
 import {CORE_DIRECTIVES} from '@angular/common';
 import {DynamicComponentLoader} from '@angular/core';
 
-import JsonSchema from './json-schema';
+import {JsonSchema} from './json-schema';
 import OptionsManager from '../../options';
 import SchemaManager from '../../utils/SchemaManager';
 
@@ -19,7 +19,7 @@ var cache = {};
   directives: [CORE_DIRECTIVES]
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ViewContainerRef], [ElementRef], [DynamicComponentLoader], [OptionsManager]])
-export default class JsonSchemaLazy {
+export class JsonSchemaLazy {
 
   constructor(schemaMgr, viewRef, elementRef, dcl, optionsMgr) {
     this.viewRef = viewRef;
diff --git a/lib/components/JsonSchema/json-schema-lazy.spec.js b/lib/components/JsonSchema/json-schema-lazy.spec.js
index e8744b7e..9b4332af 100644
--- a/lib/components/JsonSchema/json-schema-lazy.spec.js
+++ b/lib/components/JsonSchema/json-schema-lazy.spec.js
@@ -6,12 +6,14 @@ import {DynamicComponentLoader} from '@angular/core';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
-  TestComponentBuilder,
   inject,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
+
 
 import JsonSchemaLazy from 'lib/components/JsonSchema/json-schema-lazy';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index 7445e7d3..3059e845 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -1,9 +1,9 @@
 'use strict';
 
-import {ElementRef} from '@angular/core';
+import { ElementRef } from '@angular/core';
 
-import {RedocComponent, BaseComponent, SchemaManager} from '../base';
-import {DropDown} from '../../common/components/DropDown/dropdown';
+import { RedocComponent, BaseComponent, SchemaManager } from '../base';
+import { DropDown } from '../..//shared/components/index';
 import JsonPointer from '../../utils/JsonPointer';
 
 @RedocComponent({
@@ -14,7 +14,7 @@ import JsonPointer from '../../utils/JsonPointer';
   inputs: ['isArray', 'final', 'nestOdd', 'childFor', 'skipReadOnly']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef]])
-export default class JsonSchema extends BaseComponent {
+export class JsonSchema extends BaseComponent {
   constructor(schemaMgr, elementRef) {
     super(schemaMgr);
     this.$element = elementRef.nativeElement;
diff --git a/lib/components/JsonSchema/json-schema.spec.js b/lib/components/JsonSchema/json-schema.spec.js
index 6c7f2a3c..a27840f2 100644
--- a/lib/components/JsonSchema/json-schema.spec.js
+++ b/lib/components/JsonSchema/json-schema.spec.js
@@ -5,12 +5,13 @@ import {Component, provide} from '@angular/core';
 import OptionsManager from 'lib/options';
 
 import {
-  TestComponentBuilder,
   inject,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import JsonSchema from 'lib/components/JsonSchema/json-schema';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/Method/method.html b/lib/components/Method/method.html
index f3453aff..3cd33f02 100644
--- a/lib/components/Method/method.html
+++ b/lib/components/Method/method.html
@@ -20,7 +20,7 @@
     </span>
     <div *ngIf="data.bodyParam">
         <br>
-        <request-samples [pointer]="pointer" [bodySchemaPtr]="data.bodyParam._pointer">
+        <request-samples [pointer]="pointer" [schemaPointer]="data.bodyParam._pointer">
         </request-samples>
     </div>
     <div>
diff --git a/lib/components/Method/method.js b/lib/components/Method/method.js
index 89757c5f..d2ac94fa 100644
--- a/lib/components/Method/method.js
+++ b/lib/components/Method/method.js
@@ -1,22 +1,30 @@
 'use strict';
 
-import {JsonPointer} from '../../utils/JsonPointer';
-import {RedocComponent, BaseComponent} from '../base';
+import { forwardRef } from '@angular/core';
+import { JsonPointer } from '../../utils/JsonPointer';
+import { RedocComponent, BaseComponent } from '../base';
 
-import ParamsList from '../ParamsList/params-list';
-import ResponsesList from '../ResponsesList/responses-list';
-import ResponsesSamples from '../ResponsesSamples/responses-samples';
-import SchemaSample from '../SchemaSample/schema-sample';
-import RequestSamples from '../RequestSamples/request-samples';
+import {
+  ParamsList,
+  ResponsesList,
+  ResponsesSamples,
+  SchemaSample,
+  RequestSamples
+} from '../index';
 
 @RedocComponent({
   selector: 'method',
   templateUrl: './lib/components/Method/method.html',
   styleUrls: ['./lib/components/Method/method.css'],
-  directives: [ParamsList, ResponsesList, ResponsesSamples, SchemaSample, RequestSamples],
+  directives: [
+    forwardRef(() => ParamsList),
+    forwardRef(() => ResponsesList),
+    forwardRef(() => ResponsesSamples),
+    forwardRef(() => SchemaSample),
+    forwardRef(() => RequestSamples)],
   inputs: ['tag']
 })
-export default class Method extends BaseComponent {
+export class Method extends BaseComponent {
   constructor(schemaMgr) {
     super(schemaMgr);
   }
diff --git a/lib/components/Method/method.scss b/lib/components/Method/method.scss
index f3cec22a..ea625f20 100644
--- a/lib/components/Method/method.scss
+++ b/lib/components/Method/method.scss
@@ -1,5 +1,5 @@
-@import '../../common/styles/variables';
-@import '../../common/styles/share-link';
+@import '../../shared/styles/variables';
+@import '../../shared/styles/share-link';
 
 :host {
   padding-bottom: 100px;
diff --git a/lib/components/Method/method.spec.js b/lib/components/Method/method.spec.js
index b36b93e5..44756606 100644
--- a/lib/components/Method/method.spec.js
+++ b/lib/components/Method/method.spec.js
@@ -5,13 +5,14 @@ import {Component, provide} from '@angular/core';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
-  TestComponentBuilder,
-  async,
   inject,
+  async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import Method from 'lib/components/Method/method';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/MethodsList/methods-list.js b/lib/components/MethodsList/methods-list.js
index 32998a4f..169e5a61 100644
--- a/lib/components/MethodsList/methods-list.js
+++ b/lib/components/MethodsList/methods-list.js
@@ -1,8 +1,8 @@
 'use strict';
 
-import {RedocComponent, BaseComponent} from '../base';
-import Method from '../Method/method';
-import {EncodeURIComponentPipe} from '../../utils/pipes';
+import { RedocComponent, BaseComponent } from '../base';
+import { Method } from '../index';
+import { EncodeURIComponentPipe } from '../../utils/pipes';
 
 @RedocComponent({
   selector: 'methods-list',
@@ -11,7 +11,7 @@ import {EncodeURIComponentPipe} from '../../utils/pipes';
   directives: [Method],
   pipes: [EncodeURIComponentPipe]
 })
-export default class MethodsList extends BaseComponent {
+export class MethodsList extends BaseComponent {
 
   constructor(schemaMgr) {
     super(schemaMgr);
diff --git a/lib/components/MethodsList/methods-list.scss b/lib/components/MethodsList/methods-list.scss
index c4d64f39..ff1465c3 100644
--- a/lib/components/MethodsList/methods-list.scss
+++ b/lib/components/MethodsList/methods-list.scss
@@ -1,5 +1,5 @@
-@import '../../common/styles/variables';
-@import '../../common/styles/share-link';
+@import '../../shared/styles/variables';
+@import '../../shared/styles/share-link';
 
 .tag-info {
   padding: 40px;
diff --git a/lib/components/MethodsList/methods-list.spec.js b/lib/components/MethodsList/methods-list.spec.js
index 71ae31ea..87119c21 100644
--- a/lib/components/MethodsList/methods-list.spec.js
+++ b/lib/components/MethodsList/methods-list.spec.js
@@ -6,13 +6,14 @@ import OptionsManager from 'lib/options';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
-  TestComponentBuilder,
   inject,
   async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import MethodsList from 'lib/components/MethodsList/methods-list';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/ParamsList/params-list.js b/lib/components/ParamsList/params-list.js
index e664af1b..1aef52a4 100644
--- a/lib/components/ParamsList/params-list.js
+++ b/lib/components/ParamsList/params-list.js
@@ -1,8 +1,7 @@
 'use strict';
 
-import {RedocComponent, BaseComponent} from '../base';
-import JsonSchema from '../JsonSchema/json-schema';
-import JsonSchemaLazy from '../JsonSchema/json-schema-lazy';
+import { RedocComponent, BaseComponent } from '../base';
+import { JsonSchema, JsonSchemaLazy } from '../index';
 
 function safePush(obj, prop, item) {
   if (!obj[prop]) obj[prop] = [];
@@ -15,7 +14,7 @@ function safePush(obj, prop, item) {
   styleUrls: ['./lib/components/ParamsList/params-list.css'],
   directives: [JsonSchema, JsonSchemaLazy]
 })
-export default class ParamsList extends BaseComponent {
+export class ParamsList extends BaseComponent {
   constructor(schemaMgr) {
     super(schemaMgr);
   }
diff --git a/lib/components/ParamsList/params-list.scss b/lib/components/ParamsList/params-list.scss
index 211c04b4..f7b63f46 100644
--- a/lib/components/ParamsList/params-list.scss
+++ b/lib/components/ParamsList/params-list.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 $hint-color: #999999;
 
diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index 139c995b..fdb36d27 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -1,20 +1,25 @@
 'use strict';
 
-import {ChangeDetectionStrategy, provide, enableProdMode} from '@angular/core';
+import {provide, enableProdMode} from '@angular/core';
 import {ElementRef} from '@angular/core';
 import {bootstrap} from '@angular/platform-browser-dynamic';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+
 import detectScollParent from 'scrollparent';
+
 import {RedocComponent, BaseComponent} from '../base';
 import SchemaManager from '../../utils/SchemaManager';
 
-import ApiInfo from '../ApiInfo/api-info';
-import ApiLogo from '../ApiLogo/api-logo';
-import MethodsList from '../MethodsList/methods-list';
-import SideMenu from '../SideMenu/side-menu';
-import StickySidebar from '../../common/components/StickySidebar/sticky-sidebar';
+import {
+  ApiInfo,
+  ApiLogo,
+  MethodsList,
+  SideMenu
+} from '../index';
+import { StickySidebar } from '../../shared/components/index';
+
 import OptionsManager from '../../options';
-import {redocEvents} from '../../events';
+import { RedocEventsService } from '../../services/index';
 
 import './redoc-loading-styles.css!css';
 
@@ -25,23 +30,30 @@ var _modeLocked = false;
   selector: 'redoc',
   providers: [
     SchemaManager,
-    BrowserDomAdapter
+    BrowserDomAdapter,
+    RedocEventsService
   ],
   templateUrl: './lib/components/Redoc/redoc.html',
   styleUrls: ['./lib/components/Redoc/redoc.css'],
-  directives: [ApiInfo, ApiLogo, MethodsList, SideMenu, StickySidebar],
-  changeDetection: ChangeDetectionStrategy.Default
+  directives: [ApiInfo, ApiLogo, MethodsList, SideMenu, StickySidebar]
 })
 @Reflect.metadata('parameters', [
-  [SchemaManager], [OptionsManager], [ElementRef]])
-export default class Redoc extends BaseComponent {
-  constructor(schemaMgr, optionsMgr, elementRef) {
+  [SchemaManager], [OptionsManager], [ElementRef], [RedocEventsService]])
+export class Redoc extends BaseComponent {
+  constructor(schemaMgr, optionsMgr, elementRef, events) {
     super(schemaMgr);
     this.element = elementRef.nativeElement;
     //parse options (top level component doesn't support inputs)
     optionsMgr.parseOptions( this.element );
     optionsMgr.options.$scrollParent = detectScollParent( this.element );
     this.options = optionsMgr.options;
+    this.events = events;
+  }
+
+  ngAfterViewInit() {
+    setTimeout( () => {
+      this.events.bootstrapped.next();
+    });
   }
 
   static showLoadingAnimation() {
@@ -82,8 +94,6 @@ export default class Redoc extends BaseComponent {
       (appRef) => {
         Redoc.hideLoadingAnimation();
         Redoc.appRef = appRef;
-        // setTimeout to allow cached elements to init
-        setTimeout(() => redocEvents.bootstrapped.next());
         console.log('ReDoc bootstrapped!');
       },
       error => {
diff --git a/lib/components/Redoc/redoc.scss b/lib/components/Redoc/redoc.scss
index a446e4f8..048e4060 100644
--- a/lib/components/Redoc/redoc.scss
+++ b/lib/components/Redoc/redoc.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 :host {
     display: block;
diff --git a/lib/components/Redoc/redoc.spec.js b/lib/components/Redoc/redoc.spec.js
index 032ab8f0..7bf7cb92 100644
--- a/lib/components/Redoc/redoc.spec.js
+++ b/lib/components/Redoc/redoc.spec.js
@@ -5,13 +5,14 @@ import {Component, ViewMetadata, provide} from '@angular/core';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
-  TestComponentBuilder,
   inject,
   async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import Redoc from 'lib/components/Redoc/redoc';
 import SchemaManager from 'lib/utils/SchemaManager';
diff --git a/lib/components/RequestSamples/request-samples.html b/lib/components/RequestSamples/request-samples.html
index 78bb0657..a11d9b1f 100644
--- a/lib/components/RequestSamples/request-samples.html
+++ b/lib/components/RequestSamples/request-samples.html
@@ -1,8 +1,8 @@
-<header *ngIf="data.bodySchemaPtr || data.samples.length"> Request samples </header>
-<schema-sample *ngIf="!data.samples.length" [pointer]="data.bodySchemaPtr"> </schema-sample>
+<header *ngIf="data.schemaPointer || data.samples.length"> Request samples </header>
+<schema-sample *ngIf="!data.samples.length" [pointer]="data.schemaPointer"> </schema-sample>
 <tabs *ngIf="data.samples.length" (change)=changeLangNotify($event)>
   <tab tabTitle="JSON">
-    <schema-sample [pointer]="data.bodySchemaPtr"> </schema-sample>
+    <schema-sample [pointer]="data.schemaPointer"> </schema-sample>
   </tab>
   <tab *ngFor="let sample of data.samples" [tabTitle]="sample.lang">
     <pre innerHtml="{{sample.source | prism:sample.lang}}"></pre>
diff --git a/lib/components/RequestSamples/request-samples.js b/lib/components/RequestSamples/request-samples.js
index ec8a542a..c8c65408 100644
--- a/lib/components/RequestSamples/request-samples.js
+++ b/lib/components/RequestSamples/request-samples.js
@@ -1,49 +1,50 @@
 'use strict';
 
-import {ViewChildren, QueryList, ChangeDetectorRef, ChangeDetectionStrategy} from '@angular/core';
+import { forwardRef, ViewChildren, QueryList } from '@angular/core';
 
-import {RedocComponent, BaseComponent, SchemaManager} from '../base';
+import { RedocComponent, BaseComponent, SchemaManager } from '../base';
 import JsonPointer from '../../utils/JsonPointer';
-import {Tabs, Tab} from '../../common/components/Tabs/tabs';
-import SchemaSample from '../SchemaSample/schema-sample';
-import {PrismPipe} from '../../utils/pipes';
-import {redocEvents} from '../../events';
+import { Tabs, Tab } from '../..//shared/components/index';
+import { SchemaSample } from '../index';
+import { PrismPipe } from '../../utils/pipes';
+import { RedocEventsService } from '../../services/index';
 
 @RedocComponent({
   selector: 'request-samples',
   templateUrl: './lib/components/RequestSamples/request-samples.html',
   styleUrls: ['./lib/components/RequestSamples/request-samples.css'],
-  directives: [SchemaSample, Tabs, Tab],
-  inputs: ['bodySchemaPtr'],
-  pipes: [PrismPipe],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  directives: [forwardRef(() =>SchemaSample), Tabs, Tab],
+  inputs: ['schemaPointer'],
+  pipes: [PrismPipe]
 })
-@Reflect.metadata('parameters', [[SchemaManager], [new ViewChildren(Tabs), QueryList], [ChangeDetectorRef]])
-export default class RequestSamples extends BaseComponent {
-  constructor(schemaMgr, tabs, changeDetector) {
+@Reflect.metadata('parameters', [[SchemaManager], [RedocEventsService], [new ViewChildren(Tabs), QueryList]])
+export class RequestSamples extends BaseComponent {
+  constructor(schemaMgr, events, childQuery) {
     super(schemaMgr);
-    tabs.changes.subscribe(_ => {
-      this.tabs = tabs.first;
-      this.subscribeForEvents(_);
+    childQuery.changes.subscribe(() => {
+      this.childTabs = childQuery.first;
     });
-    this.changeDetector = changeDetector;
+    this.events = events;
+  }
+
+  init() {
+    this.subscribeForEvents();
   }
 
   changeLangNotify(lang) {
-    redocEvents.samplesLanguageChanged.next(lang);
+    this.events.samplesLanguageChanged.next(lang);
   }
 
   subscribeForEvents() {
-    if (!this.tabs) return;
-    redocEvents.samplesLanguageChanged.subscribe((sampleLang) => {
-      this.tabs.selectyByTitle(sampleLang);
-      this.changeDetector.markForCheck();
+    this.events.samplesLanguageChanged.subscribe((sampleLang) => {
+      if (!this.childTabs) return;
+      this.childTabs.selectyByTitle(sampleLang);
     });
   }
 
   prepareModel() {
     this.data = {};
-    this.data.bodySchemaPtr = JsonPointer.join(this.bodySchemaPtr, 'schema');
+    this.data.schemaPointer = JsonPointer.join(this.schemaPointer, 'schema');
     this.data.samples = this.componentSchema['x-code-samples'] || [];
   }
 }
diff --git a/lib/components/RequestSamples/request-samples.scss b/lib/components/RequestSamples/request-samples.scss
index 333d0420..84569503 100644
--- a/lib/components/RequestSamples/request-samples.scss
+++ b/lib/components/RequestSamples/request-samples.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 header {
     font-family: $headers-font;
diff --git a/lib/components/ResponsesList/responses-list.js b/lib/components/ResponsesList/responses-list.js
index 6c85d901..2ff52f59 100644
--- a/lib/components/ResponsesList/responses-list.js
+++ b/lib/components/ResponsesList/responses-list.js
@@ -2,9 +2,8 @@
 
 import {RedocComponent, BaseComponent, SchemaManager} from '../base';
 import JsonPointer from '../../utils/JsonPointer';
-import JsonSchema from '../JsonSchema/json-schema';
-import JsonSchemaLazy from '../JsonSchema/json-schema-lazy';
-import Zippy from '../../common/components/Zippy/zippy';
+import { JsonSchema, JsonSchemaLazy } from '../index';
+import {Zippy} from '../../shared/components/index';
 import {statusCodeType} from '../../utils/helpers';
 import OptionsManager from '../../options';
 
@@ -19,7 +18,7 @@ function isNumeric(n) {
   directives: [JsonSchema, Zippy, JsonSchemaLazy]
 })
 @Reflect.metadata('parameters', [[SchemaManager], [OptionsManager]])
-export default class ResponsesList extends BaseComponent {
+export class ResponsesList extends BaseComponent {
   constructor(schemaMgr, optionsMgr) {
     super(schemaMgr);
     this.options = optionsMgr.options;
diff --git a/lib/components/ResponsesList/responses-list.scss b/lib/components/ResponsesList/responses-list.scss
index d9212b11..c63354c9 100644
--- a/lib/components/ResponsesList/responses-list.scss
+++ b/lib/components/ResponsesList/responses-list.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 .responses-list-header {
   font-size: 18px;
diff --git a/lib/components/ResponsesSamples/responses-samples.js b/lib/components/ResponsesSamples/responses-samples.js
index db573f84..3515f5e9 100644
--- a/lib/components/ResponsesSamples/responses-samples.js
+++ b/lib/components/ResponsesSamples/responses-samples.js
@@ -1,10 +1,11 @@
 'use strict';
 
-import {RedocComponent, BaseComponent} from '../base';
+import { forwardRef } from '@angular/core';
+import { RedocComponent, BaseComponent } from '../base';
 import JsonPointer from '../../utils/JsonPointer';
-import {Tabs, Tab} from '../../common/components/Tabs/tabs';
-import SchemaSample from '../SchemaSample/schema-sample';
-import {statusCodeType} from '../../utils/helpers';
+import { Tabs, Tab } from '../../shared/components/index';
+import { SchemaSample } from '../index';
+import { statusCodeType } from '../../utils/helpers';
 
 
 function isNumeric(n) {
@@ -20,9 +21,9 @@ function hasExample(response) {
   selector: 'responses-samples',
   templateUrl: './lib/components/ResponsesSamples/responses-samples.html',
   styleUrls: ['./lib/components/ResponsesSamples/responses-samples.css'],
-  directives: [SchemaSample, Tabs, Tab]
+  directives: [forwardRef( ()=> SchemaSample), Tabs, Tab]
 })
-export default class ResponsesSamples extends BaseComponent {
+export class ResponsesSamples extends BaseComponent {
   constructor(schemaMgr) {
     super(schemaMgr);
   }
diff --git a/lib/components/ResponsesSamples/responses-samples.scss b/lib/components/ResponsesSamples/responses-samples.scss
index cb9ab0cd..1334dd8d 100644
--- a/lib/components/ResponsesSamples/responses-samples.scss
+++ b/lib/components/ResponsesSamples/responses-samples.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 tab, tabs {
     display: block;
diff --git a/lib/components/SchemaSample/schema-sample.js b/lib/components/SchemaSample/schema-sample.js
index 21f5f09f..0c350ba1 100644
--- a/lib/components/SchemaSample/schema-sample.js
+++ b/lib/components/SchemaSample/schema-sample.js
@@ -1,11 +1,11 @@
 'use strict';
 
-import {ElementRef} from '@angular/core';
+import { ElementRef } from '@angular/core';
 
 import SchemaSampler from 'json-schema-instantiator';
 
-import {JsonFormatter} from '../../utils/JsonFormatterPipe';
-import {RedocComponent, BaseComponent, SchemaManager} from '../base';
+import { RedocComponent, BaseComponent, SchemaManager } from '../base';
+import { JsonFormatter } from '../../utils/JsonFormatterPipe';
 
 @RedocComponent({
   selector: 'schema-sample',
@@ -14,7 +14,7 @@ import {RedocComponent, BaseComponent, SchemaManager} from '../base';
   styleUrls: ['./lib/components/SchemaSample/schema-sample.css']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef]])
-export default class SchemaSample extends BaseComponent {
+export class SchemaSample extends BaseComponent {
   constructor(schemaMgr, elementRef) {
     super(schemaMgr);
     this.element = elementRef.nativeElement;
diff --git a/lib/components/SchemaSample/schema-sample.scss b/lib/components/SchemaSample/schema-sample.scss
index 13463cca..ef191331 100644
--- a/lib/components/SchemaSample/schema-sample.scss
+++ b/lib/components/SchemaSample/schema-sample.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 
 pre {
   background-color: transparent;
diff --git a/lib/components/SideMenu/side-menu.html b/lib/components/SideMenu/side-menu.html
index 429f7db7..a947fcc1 100644
--- a/lib/components/SideMenu/side-menu.html
+++ b/lib/components/SideMenu/side-menu.html
@@ -1,11 +1,11 @@
-<div class="mobile-nav" (click)="toggleMobileNav()">
+<div #mobile class="mobile-nav" (click)="toggleMobileNav()">
   <span class="menu-header"> API Reference: </span>
   <span class="selected-item-info">
     <span class="selected-tag"> {{activeCatCaption}} </span>
     <span class="selected-endpoint">{{activeItemCaption}}</span>
   </span>
 </div>
-<div id="resources-nav">
+<div #desktop id="resources-nav">
   <h5 class="menu-header"> API reference </h5>
   <div *ngFor="let cat of data.menu; let idx = index" class="menu-cat">
 
diff --git a/lib/components/SideMenu/side-menu.js b/lib/components/SideMenu/side-menu.js
index 5ab3ebaf..a4bf4fb1 100644
--- a/lib/components/SideMenu/side-menu.js
+++ b/lib/components/SideMenu/side-menu.js
@@ -1,11 +1,11 @@
 'use strict';
 
-import {ElementRef} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-import {global} from '@angular/core/src/facade/lang';
+import { ElementRef } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { global } from '@angular/core/src/facade/lang';
 
-import {RedocComponent, BaseComponent, SchemaManager} from '../base';
-import {redocEvents} from '../../events';
+import { RedocComponent, BaseComponent, SchemaManager } from '../base';
+import { RedocEventsService } from '../../services/index';
 import OptionsManager from '../../options';
 
 const CHANGE = {
@@ -26,9 +26,9 @@ const INVIEW_POSITION = {
   styleUrls: ['./lib/components/SideMenu/side-menu.css']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef],
-  [BrowserDomAdapter],  [OptionsManager]])
-export default class SideMenu extends BaseComponent {
-  constructor(schemaMgr, elementRef, dom, optionsMgr) {
+  [BrowserDomAdapter], [OptionsManager], [RedocEventsService]])
+export class SideMenu extends BaseComponent {
+  constructor(schemaMgr, elementRef, dom, optionsMgr, events) {
     super(schemaMgr);
     this.$element = elementRef.nativeElement;
     this.dom = dom;
@@ -39,14 +39,14 @@ export default class SideMenu extends BaseComponent {
     this.activeMethodIdx = -1;
     this.prevOffsetY = null;
 
-    redocEvents.bootstrapped.subscribe(() => this.hashScroll());
+    this.events = events;
 
     this.activeCatCaption = '';
     this.activeItemCaption = '';
   }
 
-
   init() {
+    this.events.bootstrapped.subscribe(() => this.hashScroll());
     this.bindEvents();
     this.$mobileNav = this.dom.querySelector(this.$element, '.mobile-nav');
     this.$resourcesNav = this.dom.querySelector(this.$element, '#resources-nav');
diff --git a/lib/components/SideMenu/side-menu.scss b/lib/components/SideMenu/side-menu.scss
index d2c7ac3e..47c026b6 100644
--- a/lib/components/SideMenu/side-menu.scss
+++ b/lib/components/SideMenu/side-menu.scss
@@ -1,4 +1,4 @@
-@import '../../common/styles/variables';
+@import '../../shared/styles/variables';
 $mobile-menu-compact-breakpoint: 550px;
 
 .menu-header {
diff --git a/lib/components/SideMenu/side-menu.spec.js b/lib/components/SideMenu/side-menu.spec.js
index 04762365..dfeecdd7 100644
--- a/lib/components/SideMenu/side-menu.spec.js
+++ b/lib/components/SideMenu/side-menu.spec.js
@@ -6,13 +6,14 @@ import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_a
 import OptionsManager from 'lib/options';
 
 import {
-  TestComponentBuilder,
   inject,
   async,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import {redocEvents} from 'lib/events';
 import MethodsList from 'lib/components/MethodsList/methods-list';
diff --git a/lib/components/base.js b/lib/components/base.js
index c3ee656f..97a1e77c 100644
--- a/lib/components/base.js
+++ b/lib/components/base.js
@@ -1,9 +1,9 @@
 'use strict';
-import {Component, ChangeDetectionStrategy} from '@angular/core';
-import {CORE_DIRECTIVES, JsonPipe, AsyncPipe} from '@angular/common';
+import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { CORE_DIRECTIVES, JsonPipe, AsyncPipe } from '@angular/common';
 import SchemaManager from '../utils/SchemaManager';
 import JsonPointer from '../utils/JsonPointer';
-import {MarkedPipe, JsonPointerEscapePipe} from '../utils/pipes';
+import { MarkedPipe, JsonPointerEscapePipe } from '../utils/pipes';
 
 export { SchemaManager };
 
diff --git a/lib/components/index.js b/lib/components/index.js
index d46dead8..941ae2a4 100644
--- a/lib/components/index.js
+++ b/lib/components/index.js
@@ -1,42 +1,15 @@
 'use strict';
 
-import ApiInfo from './ApiInfo/api-info';
-import ApiLogo from './ApiLogo/api-logo';
-import Method from './Method/method.js';
-import MethodsList from './MethodsList/methods-list';
-import ParamsList from './ParamsList/params-list';
-import Redoc from './Redoc/redoc';
-import ResponsesList from './ResponsesList/responses-list';
-import ResponsesSamples from './ResponsesSamples/responses-samples';
-import SchemaSample from './SchemaSample/schema-sample';
-import SideMenu from './SideMenu/side-menu';
-import JsonSchema from './JsonSchema/json-schema';
-
-const REDOC_COMPONENTS = [
-  ApiInfo,
-  ApiLogo,
-  JsonSchema,
-  Method,
-  MethodsList,
-  ParamsList,
-  Redoc,
-  ResponsesList,
-  ResponsesSamples,
-  SchemaSample,
-  SideMenu
-];
-
-export {
-  ApiInfo,
-  ApiLogo,
-  JsonSchema,
-  Method,
-  MethodsList,
-  ParamsList,
-  Redoc,
-  ResponsesList,
-  ResponsesSamples,
-  SchemaSample,
-  SideMenu,
-  REDOC_COMPONENTS
-};
+export * from './ApiInfo/api-info';
+export * from './ApiLogo/api-logo';
+export * from './JsonSchema/json-schema';
+export * from './JsonSchema/json-schema-lazy';
+export * from './ParamsList/params-list';
+export * from './RequestSamples/request-samples';
+export * from './ResponsesList/responses-list';
+export * from './ResponsesSamples/responses-samples';
+export * from './SchemaSample/schema-sample';
+export * from './SideMenu/side-menu';
+export * from './Method/method';
+export * from './MethodsList/methods-list';
+export * from './Redoc/redoc';
diff --git a/lib/events.js b/lib/events.js
deleted file mode 100644
index 2dcac54f..00000000
--- a/lib/events.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-import {EventEmitter} from '@angular/core';
-
-var bootsrEmmiter = new EventEmitter();
-var langChanged = new EventEmitter();
-export var redocEvents = {
-  bootstrapped: bootsrEmmiter,
-  samplesLanguageChanged: langChanged
-};
diff --git a/lib/services/events.service.js b/lib/services/events.service.js
new file mode 100644
index 00000000..4886b703
--- /dev/null
+++ b/lib/services/events.service.js
@@ -0,0 +1,10 @@
+'use strict';
+
+import {EventEmitter} from '@angular/core';
+
+export class RedocEventsService {
+  constructor() {
+    this.bootstrapped = new EventEmitter();
+    this.samplesLanguageChanged = new EventEmitter();
+  }
+}
diff --git a/lib/services/index.js b/lib/services/index.js
new file mode 100644
index 00000000..29de613a
--- /dev/null
+++ b/lib/services/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+export * from './events.service.js';
diff --git a/lib/common/components/DropDown/dropdown.js b/lib/shared/components/DropDown/drop-down.js
similarity index 92%
rename from lib/common/components/DropDown/dropdown.js
rename to lib/shared/components/DropDown/drop-down.js
index 1375b643..349dd0a3 100644
--- a/lib/common/components/DropDown/dropdown.js
+++ b/lib/shared/components/DropDown/drop-down.js
@@ -14,7 +14,7 @@ import 'Robdel12/DropKick/build/css/dropkick.css!css';
     </select>
   `,
   directives: [CORE_DIRECTIVES],
-  styleUrls: ['./lib/common/components/DropDown/dropdown.css']
+  styleUrls: ['./lib/shared/components/DropDown/drop-down.css']
 })
 @Reflect.metadata('parameters', [[ElementRef]])
 export class DropDown {
diff --git a/lib/common/components/DropDown/dropdown.scss b/lib/shared/components/DropDown/drop-down.scss
similarity index 100%
rename from lib/common/components/DropDown/dropdown.scss
rename to lib/shared/components/DropDown/drop-down.scss
diff --git a/lib/common/components/StickySidebar/sticky-sidebar.js b/lib/shared/components/StickySidebar/sticky-sidebar.js
similarity index 97%
rename from lib/common/components/StickySidebar/sticky-sidebar.js
rename to lib/shared/components/StickySidebar/sticky-sidebar.js
index 65919173..6aa8a274 100644
--- a/lib/common/components/StickySidebar/sticky-sidebar.js
+++ b/lib/shared/components/StickySidebar/sticky-sidebar.js
@@ -8,7 +8,7 @@ import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_a
   inputs: ['scrollParent', 'scrollYOffset']
 })
 @Reflect.metadata('parameters', [[ElementRef], [BrowserDomAdapter]])
-export default class StickySidebar {
+export class StickySidebar {
   constructor(elementRef, dom) {
     this.$element = elementRef.nativeElement;
     this.dom = dom;
diff --git a/lib/common/components/StickySidebar/sticky-sidebar.spec.js b/lib/shared/components/StickySidebar/sticky-sidebar.spec.js
similarity index 90%
rename from lib/common/components/StickySidebar/sticky-sidebar.spec.js
rename to lib/shared/components/StickySidebar/sticky-sidebar.spec.js
index 50cf4a36..50185457 100644
--- a/lib/common/components/StickySidebar/sticky-sidebar.spec.js
+++ b/lib/shared/components/StickySidebar/sticky-sidebar.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElementByType } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import { Component, provide } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   TestComponentBuilder,
@@ -12,7 +12,7 @@ import {
   it
 } from '@angular/testing';
 
-import StickySidebar from 'lib/common/components/StickySidebar/sticky-sidebar';
+import { StickySidebar } from 'lib/shared/components/index';
 
 describe('Common components', () => {
   describe('StickySidebar Component', () => {
diff --git a/lib/common/components/Tabs/tabs.js b/lib/shared/components/Tabs/tabs.js
similarity index 96%
rename from lib/common/components/Tabs/tabs.js
rename to lib/shared/components/Tabs/tabs.js
index e620f926..ed6094de 100644
--- a/lib/common/components/Tabs/tabs.js
+++ b/lib/shared/components/Tabs/tabs.js
@@ -14,7 +14,7 @@ import {CORE_DIRECTIVES} from '@angular/common';
     <ng-content></ng-content>
   `,
   directives: [CORE_DIRECTIVES],
-  styleUrls: ['./lib/common/components/Tabs/tabs.css']
+  styleUrls: ['./lib/shared/components/Tabs/tabs.css']
 })
 export class Tabs {
   constructor() {
diff --git a/lib/common/components/Tabs/tabs.scss b/lib/shared/components/Tabs/tabs.scss
similarity index 100%
rename from lib/common/components/Tabs/tabs.scss
rename to lib/shared/components/Tabs/tabs.scss
diff --git a/lib/common/components/Tabs/tabs.spec.js b/lib/shared/components/Tabs/tabs.spec.js
similarity index 98%
rename from lib/common/components/Tabs/tabs.spec.js
rename to lib/shared/components/Tabs/tabs.spec.js
index 65f080c2..86915b21 100644
--- a/lib/common/components/Tabs/tabs.spec.js
+++ b/lib/shared/components/Tabs/tabs.spec.js
@@ -10,7 +10,7 @@ import {
   it
 } from '@angular/testing';
 
-import {Tabs, Tab} from 'lib/common/components/Tabs/tabs';
+import {Tabs, Tab} from 'lib/shared/components/index';
 
 describe('Common components', () => {
   describe('Tabs Component', () => {
diff --git a/lib/common/components/Zippy/zippy.html b/lib/shared/components/Zippy/zippy.html
similarity index 100%
rename from lib/common/components/Zippy/zippy.html
rename to lib/shared/components/Zippy/zippy.html
diff --git a/lib/common/components/Zippy/zippy.js b/lib/shared/components/Zippy/zippy.js
similarity index 79%
rename from lib/common/components/Zippy/zippy.js
rename to lib/shared/components/Zippy/zippy.js
index f6cd5519..9fdc2a65 100644
--- a/lib/common/components/Zippy/zippy.js
+++ b/lib/shared/components/Zippy/zippy.js
@@ -7,11 +7,11 @@ import {CORE_DIRECTIVES} from '@angular/common';
   selector: 'zippy',
   events: ['open', 'close'],
   inputs: ['title', 'visible', 'type', 'empty'],
-  templateUrl: './lib/common/components/Zippy/zippy.html',
-  styleUrls: ['./lib/common/components/Zippy/zippy.css'],
+  templateUrl: './lib/shared/components/Zippy/zippy.html',
+  styleUrls: ['./lib/shared/components/Zippy/zippy.css'],
   directives: [CORE_DIRECTIVES]
 })
-export default class Zippy {
+export class Zippy {
 
   constructor() {
     this.type = 'general';
diff --git a/lib/common/components/Zippy/zippy.scss b/lib/shared/components/Zippy/zippy.scss
similarity index 100%
rename from lib/common/components/Zippy/zippy.scss
rename to lib/shared/components/Zippy/zippy.scss
diff --git a/lib/common/components/Zippy/zippy.spec.js b/lib/shared/components/Zippy/zippy.spec.js
similarity index 96%
rename from lib/common/components/Zippy/zippy.spec.js
rename to lib/shared/components/Zippy/zippy.spec.js
index e277eb68..d461a80f 100644
--- a/lib/common/components/Zippy/zippy.spec.js
+++ b/lib/shared/components/Zippy/zippy.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElement, mouseclick } from 'tests/helpers';
-import {Component} from '@angular/core';
 
+import { Component } from '@angular/core';
 import {
   TestComponentBuilder,
   inject,
@@ -10,7 +10,7 @@ import {
   it
 } from '@angular/testing';
 
-import Zippy from 'lib/common/components/Zippy/zippy';
+import { Zippy } from 'lib/shared/components/index';
 
 describe('Common components', () => {
   describe('Zippy Component', () => {
diff --git a/lib/shared/components/index.js b/lib/shared/components/index.js
new file mode 100644
index 00000000..6d37711d
--- /dev/null
+++ b/lib/shared/components/index.js
@@ -0,0 +1,5 @@
+'use strict';
+export * from './DropDown/drop-down';
+export * from './StickySidebar/sticky-sidebar';
+export * from './Tabs/tabs';
+export * from './Zippy/zippy';
diff --git a/lib/common/styles/_share-link.scss b/lib/shared/styles/_share-link.scss
similarity index 100%
rename from lib/common/styles/_share-link.scss
rename to lib/shared/styles/_share-link.scss
diff --git a/lib/common/styles/_variables.scss b/lib/shared/styles/_variables.scss
similarity index 100%
rename from lib/common/styles/_variables.scss
rename to lib/shared/styles/_variables.scss
diff --git a/package.json b/package.json
index df404abb..eaa30ff4 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,9 @@
         "map": {
           "http": "npm:stream-http@2.3.0"
         }
+      },
+      "npm:@angular/core@2.0.0-rc.1": {
+        "format": "esm"
       }
     }
   },
diff --git a/system.config.js b/system.config.js
index fae45007..6a373a24 100644
--- a/system.config.js
+++ b/system.config.js
@@ -149,7 +149,6 @@ System.config({
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:@angular/core@2.0.0-rc.1": {
-      "process": "github:jspm/nodelibs-process@0.1.2",
       "rxjs": "npm:rxjs@5.0.0-beta.6",
       "zone.js": "npm:zone.js@0.6.12"
     },
diff --git a/tests/helpers.js b/tests/helpers.js
index 90f2bc14..3d702a42 100644
--- a/tests/helpers.js
+++ b/tests/helpers.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {By} from 'angular2/platform/browser';
+import {By} from '@angular/platform-browser';
 
 /** Gets a child DebugElement by tag name. */
 export function getChildDebugElement(parent, tagName) {

From 68e77f9350fef191ed172abe9b24405716d19814 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Fri, 6 May 2016 12:46:41 +0300
Subject: [PATCH 04/14] more refactor

---
 lib/components/ApiInfo/api-info.js            | 12 ++++----
 lib/components/ApiInfo/api-info.spec.js       |  6 ++--
 lib/components/JsonSchema/json-schema-lazy.js | 19 ++++++------
 .../JsonSchema/json-schema-lazy.spec.js       | 10 +++----
 lib/components/JsonSchema/json-schema.spec.js | 14 ++++-----
 lib/components/Method/method.spec.js          | 15 +++++-----
 .../MethodsList/methods-list.spec.js          |  4 +--
 lib/components/Redoc/redoc.js                 | 29 ++++++++-----------
 lib/components/Redoc/redoc.spec.js            |  8 ++---
 .../ResponsesList/responses-list.js           |  4 +--
 lib/components/SideMenu/side-menu.js          |  4 +--
 lib/components/SideMenu/side-menu.spec.js     |  6 ++--
 lib/services/index.js                         |  1 +
 .../options.service.js}                       | 21 +++++++-------
 package.json                                  |  3 --
 system.config.js                              |  4 +--
 16 files changed, 76 insertions(+), 84 deletions(-)
 rename lib/{options.js => services/options.service.js} (77%)

diff --git a/lib/components/ApiInfo/api-info.js b/lib/components/ApiInfo/api-info.js
index 336bbaf5..89d39f6d 100644
--- a/lib/components/ApiInfo/api-info.js
+++ b/lib/components/ApiInfo/api-info.js
@@ -1,22 +1,22 @@
 'use strict';
 
-import {SchemaManager, RedocComponent, BaseComponent} from '../base';
-import OptionsManager from '../../options';
+import { SchemaManager, RedocComponent, BaseComponent } from '../base';
+import { OptionsService } from '../../services/index';
 
 @RedocComponent({
   selector: 'api-info',
   styleUrls: ['./lib/components/ApiInfo/api-info.css'],
   templateUrl: './lib/components/ApiInfo/api-info.html'
 })
-@Reflect.metadata('parameters', [[SchemaManager], [OptionsManager]])
+@Reflect.metadata('parameters', [[SchemaManager], [OptionsService]])
 export class ApiInfo extends BaseComponent {
-  constructor(schemaMgr, optionsMgr) {
+  constructor(schemaMgr, optionsService) {
     super(schemaMgr);
-    this.optionsMgr = optionsMgr;
+    this.optionsService = optionsService;
   }
 
   prepareModel() {
     this.data = this.componentSchema.info;
-    this.specUrl = this.optionsMgr.options.specUrl;
+    this.specUrl = this.optionsService.options.specUrl;
   }
 }
diff --git a/lib/components/ApiInfo/api-info.spec.js b/lib/components/ApiInfo/api-info.spec.js
index d34fdae9..e72e4f4e 100644
--- a/lib/components/ApiInfo/api-info.spec.js
+++ b/lib/components/ApiInfo/api-info.spec.js
@@ -15,9 +15,9 @@ import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import ApiInfo from 'lib/components/ApiInfo/api-info';
 import SchemaManager from 'lib/utils/SchemaManager';
-import OptionsManager from 'lib/options';
+import { OptionsService } from 'lib/services/index';
 
-let optsMgr = new OptionsManager();
+let optionsService = new OptionsService();
 
 describe('Redoc components', () => {
   describe('ApiInfo Component', () => {
@@ -26,7 +26,7 @@ describe('Redoc components', () => {
     let fixture;
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
-        provide(OptionsManager, {useValue: optsMgr})
+        provide(OptionsService, {useValue: optionsService})
     ]);
 
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
diff --git a/lib/components/JsonSchema/json-schema-lazy.js b/lib/components/JsonSchema/json-schema-lazy.js
index 5f3e1cf7..560118e6 100644
--- a/lib/components/JsonSchema/json-schema-lazy.js
+++ b/lib/components/JsonSchema/json-schema-lazy.js
@@ -1,11 +1,11 @@
 'use strict';
 
-import {Component, ElementRef, ViewContainerRef} from '@angular/core';
-import {CORE_DIRECTIVES} from '@angular/common';
-import {DynamicComponentLoader} from '@angular/core';
+import { Component, ElementRef, ViewContainerRef } from '@angular/core';
+import { CORE_DIRECTIVES } from '@angular/common';
+import { DynamicComponentLoader } from '@angular/core';
 
-import {JsonSchema} from './json-schema';
-import OptionsManager from '../../options';
+import { JsonSchema } from './json-schema';
+import { OptionsService } from '../../services/index';
 import SchemaManager from '../../utils/SchemaManager';
 
 
@@ -18,14 +18,15 @@ var cache = {};
   template: '',
   directives: [CORE_DIRECTIVES]
 })
-@Reflect.metadata('parameters', [[SchemaManager], [ViewContainerRef], [ElementRef], [DynamicComponentLoader], [OptionsManager]])
+@Reflect.metadata('parameters', [[SchemaManager], [ViewContainerRef], [
+  ElementRef], [DynamicComponentLoader], [OptionsService]])
 export class JsonSchemaLazy {
 
-  constructor(schemaMgr, viewRef, elementRef, dcl, optionsMgr) {
+  constructor(schemaMgr, viewRef, elementRef, dcl, optionsService) {
     this.viewRef = viewRef;
     this.elementRef = elementRef;
     this.dcl = dcl;
-    this.optionsMgr = optionsMgr;
+    this.optionsService = optionsService;
     this.schemaMgr = schemaMgr;
   }
 
@@ -35,7 +36,7 @@ export class JsonSchemaLazy {
   }
 
   load() {
-    if (this.optionsMgr.options.disableLazySchemas) return;
+    if (this.optionsService.options.disableLazySchemas) return;
     if (this.loaded) return;
     if (this.pointer) {
       this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
diff --git a/lib/components/JsonSchema/json-schema-lazy.spec.js b/lib/components/JsonSchema/json-schema-lazy.spec.js
index 9b4332af..2b921abe 100644
--- a/lib/components/JsonSchema/json-schema-lazy.spec.js
+++ b/lib/components/JsonSchema/json-schema-lazy.spec.js
@@ -1,9 +1,9 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
-import {DynamicComponentLoader} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import { Component, provide } from '@angular/core';
+import { DynamicComponentLoader } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   inject,
@@ -17,7 +17,7 @@ import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import JsonSchemaLazy from 'lib/components/JsonSchema/json-schema-lazy';
 import SchemaManager from 'lib/utils/SchemaManager';
-import OptionsManager from 'lib/options';
+import { OptionsService } from 'lib/services/index';
 
 describe('Redoc components', () => {
   describe('JsonSchemaLazy Component', () => {
@@ -33,7 +33,7 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: schemaMgr}),
         provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
-        provide(OptionsManager, {useClass: OptionsManager})
+        provide(OptionsService, {useClass: OptionsService})
     ]);
     beforeEach(inject([TestComponentBuilder, DynamicComponentLoader], (tcb, dcl) => {
       builder = tcb;
diff --git a/lib/components/JsonSchema/json-schema.spec.js b/lib/components/JsonSchema/json-schema.spec.js
index a27840f2..1b0d197d 100644
--- a/lib/components/JsonSchema/json-schema.spec.js
+++ b/lib/components/JsonSchema/json-schema.spec.js
@@ -1,19 +1,19 @@
 'use strict';
 
-import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
-import OptionsManager from 'lib/options';
-
+import { Component, provide } from '@angular/core';
 import {
   inject,
   beforeEach,
   beforeEachProviders,
   it
 } from '@angular/core/testing';
-
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import JsonSchema from 'lib/components/JsonSchema/json-schema';
+import { OptionsService } from 'lib/services/index';
+import { getChildDebugElement } from 'tests/helpers';
+
+
+import { JsonSchema } from 'lib/components/index';
 import SchemaManager from 'lib/utils/SchemaManager';
 
 describe('Redoc components', () => {
@@ -24,7 +24,7 @@ describe('Redoc components', () => {
     let fixture;
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: schemaMgr}),
-        provide(OptionsManager, {useClass: OptionsManager})
+        provide(OptionsService, {useClass: OptionsService})
     ]);
     beforeEach(inject([TestComponentBuilder], (tcb) => {
       builder = tcb;
diff --git a/lib/components/Method/method.spec.js b/lib/components/Method/method.spec.js
index 44756606..dab81d1c 100644
--- a/lib/components/Method/method.spec.js
+++ b/lib/components/Method/method.spec.js
@@ -1,9 +1,7 @@
 'use strict';
 
-import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-
+import { Component, provide } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import {
   inject,
   async,
@@ -11,12 +9,13 @@ import {
   beforeEachProviders,
   it
 } from '@angular/core/testing';
-
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import Method from 'lib/components/Method/method';
+import { getChildDebugElement } from 'tests/helpers';
+
+import { Method } from 'lib/components/index';
 import SchemaManager from 'lib/utils/SchemaManager';
-import OptionsManager from 'lib/options';
+import OptionsService from 'lib/services/index';
 
 describe('Redoc components', () => {
   describe('Method Component', () => {
@@ -25,7 +24,7 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
-        provide(OptionsManager, {useClass: OptionsManager})
+        provide(OptionsService, {useClass: OptionsService})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
diff --git a/lib/components/MethodsList/methods-list.spec.js b/lib/components/MethodsList/methods-list.spec.js
index 87119c21..8d3e6ba5 100644
--- a/lib/components/MethodsList/methods-list.spec.js
+++ b/lib/components/MethodsList/methods-list.spec.js
@@ -2,7 +2,7 @@
 
 import { getChildDebugElement } from 'tests/helpers';
 import {Component, provide} from '@angular/core';
-import OptionsManager from 'lib/options';
+import { OptionsService } from 'lib/services/index';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
@@ -25,7 +25,7 @@ describe('Redoc components', () => {
     let fixture;
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
-        provide(OptionsManager, {useClass: OptionsManager}),
+        provide(OptionsService, {useClass: OptionsService}),
         provide(BrowserDomAdapter, {useClass: BrowserDomAdapter})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index fdb36d27..6989a871 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -1,15 +1,10 @@
 'use strict';
 
-import {provide, enableProdMode} from '@angular/core';
-import {ElementRef} from '@angular/core';
-import {bootstrap} from '@angular/platform-browser-dynamic';
+import { provide, enableProdMode, ElementRef} from '@angular/core';
+import { bootstrap } from '@angular/platform-browser-dynamic';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
 
-import detectScollParent from 'scrollparent';
-
-import {RedocComponent, BaseComponent} from '../base';
-import SchemaManager from '../../utils/SchemaManager';
-
+import { RedocComponent, BaseComponent } from '../base';
 import {
   ApiInfo,
   ApiLogo,
@@ -17,10 +12,10 @@ import {
   SideMenu
 } from '../index';
 import { StickySidebar } from '../../shared/components/index';
+import SchemaManager from '../../utils/SchemaManager';
+import { OptionsService, RedocEventsService } from '../../services/index';
 
-import OptionsManager from '../../options';
-import { RedocEventsService } from '../../services/index';
-
+import detectScollParent from 'scrollparent';
 import './redoc-loading-styles.css!css';
 
 var dom = new BrowserDomAdapter();
@@ -38,7 +33,7 @@ var _modeLocked = false;
   directives: [ApiInfo, ApiLogo, MethodsList, SideMenu, StickySidebar]
 })
 @Reflect.metadata('parameters', [
-  [SchemaManager], [OptionsManager], [ElementRef], [RedocEventsService]])
+  [SchemaManager], [OptionsService], [ElementRef], [RedocEventsService]])
 export class Redoc extends BaseComponent {
   constructor(schemaMgr, optionsMgr, elementRef, events) {
     super(schemaMgr);
@@ -71,11 +66,11 @@ export class Redoc extends BaseComponent {
   }
 
   static init(specUrl, options) {
-    var optionsMgr = new OptionsManager();
-    optionsMgr.options = options;
-    optionsMgr.options.specUrl = optionsMgr.options.specUrl || specUrl;
+    var optionsService = new OptionsService(dom);
+    optionsService.options = options;
+    optionsService.options.specUrl = optionsService.options.specUrl || specUrl;
     var providers = [
-      provide(OptionsManager, {useValue: optionsMgr})
+      provide(OptionsService, {useValue: optionsService})
     ];
 
     if (Redoc.appRef) {
@@ -84,7 +79,7 @@ export class Redoc extends BaseComponent {
     Redoc.showLoadingAnimation();
     return SchemaManager.instance().load(specUrl)
     .then(() => {
-      if (!_modeLocked && !optionsMgr.options.debugMode) {
+      if (!_modeLocked && !optionsService.options.debugMode) {
         enableProdMode();
         _modeLocked = true;
       }
diff --git a/lib/components/Redoc/redoc.spec.js b/lib/components/Redoc/redoc.spec.js
index 7bf7cb92..1a5fcae1 100644
--- a/lib/components/Redoc/redoc.spec.js
+++ b/lib/components/Redoc/redoc.spec.js
@@ -16,9 +16,9 @@ import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import Redoc from 'lib/components/Redoc/redoc';
 import SchemaManager from 'lib/utils/SchemaManager';
-import OptionsManager from 'lib/options';
+import { OptionsService } from 'lib/services/index';
 
-let optsMgr = new OptionsManager();
+let optsMgr = new OptionsService();
 
 describe('Redoc components', () => {
   describe('Redoc Component', () => {
@@ -26,7 +26,7 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
-        provide(OptionsManager, {useValue: optsMgr})
+        provide(OptionsService, {useValue: optsMgr})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
@@ -152,7 +152,7 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
-        provide(OptionsManager, {useValue: optsMgr})
+        provide(OptionsService, {useValue: optsMgr})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
diff --git a/lib/components/ResponsesList/responses-list.js b/lib/components/ResponsesList/responses-list.js
index 2ff52f59..6567861f 100644
--- a/lib/components/ResponsesList/responses-list.js
+++ b/lib/components/ResponsesList/responses-list.js
@@ -5,7 +5,7 @@ import JsonPointer from '../../utils/JsonPointer';
 import { JsonSchema, JsonSchemaLazy } from '../index';
 import {Zippy} from '../../shared/components/index';
 import {statusCodeType} from '../../utils/helpers';
-import OptionsManager from '../../options';
+import { OptionsService } from '../../services/index';
 
 function isNumeric(n) {
   return (!isNaN(parseFloat(n)) && isFinite(n));
@@ -17,7 +17,7 @@ function isNumeric(n) {
   styleUrls: ['./lib/components/ResponsesList/responses-list.css'],
   directives: [JsonSchema, Zippy, JsonSchemaLazy]
 })
-@Reflect.metadata('parameters', [[SchemaManager], [OptionsManager]])
+@Reflect.metadata('parameters', [[SchemaManager], [OptionsService]])
 export class ResponsesList extends BaseComponent {
   constructor(schemaMgr, optionsMgr) {
     super(schemaMgr);
diff --git a/lib/components/SideMenu/side-menu.js b/lib/components/SideMenu/side-menu.js
index a4bf4fb1..c79e4b83 100644
--- a/lib/components/SideMenu/side-menu.js
+++ b/lib/components/SideMenu/side-menu.js
@@ -6,7 +6,7 @@ import { global } from '@angular/core/src/facade/lang';
 
 import { RedocComponent, BaseComponent, SchemaManager } from '../base';
 import { RedocEventsService } from '../../services/index';
-import OptionsManager from '../../options';
+import { OptionsService } from '../../services/index';
 
 const CHANGE = {
   NEXT : 1,
@@ -26,7 +26,7 @@ const INVIEW_POSITION = {
   styleUrls: ['./lib/components/SideMenu/side-menu.css']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef],
-  [BrowserDomAdapter], [OptionsManager], [RedocEventsService]])
+  [BrowserDomAdapter], [OptionsService], [RedocEventsService]])
 export class SideMenu extends BaseComponent {
   constructor(schemaMgr, elementRef, dom, optionsMgr, events) {
     super(schemaMgr);
diff --git a/lib/components/SideMenu/side-menu.spec.js b/lib/components/SideMenu/side-menu.spec.js
index dfeecdd7..55d53019 100644
--- a/lib/components/SideMenu/side-menu.spec.js
+++ b/lib/components/SideMenu/side-menu.spec.js
@@ -3,7 +3,7 @@
 import { getChildDebugElement, mouseclick} from 'tests/helpers';
 import {Component, provide, ViewMetadata} from '@angular/core';
 import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-import OptionsManager from 'lib/options';
+import { OptionsService } from 'lib/services/index';
 
 import {
   inject,
@@ -20,7 +20,7 @@ import MethodsList from 'lib/components/MethodsList/methods-list';
 import SideMenu from 'lib/components/SideMenu/side-menu';
 import SchemaManager from 'lib/utils/SchemaManager';
 
-let testOptions = new OptionsManager();
+let testOptions = new OptionsService();
 testOptions.options = {
   scrollYOffset: () => 0,
   scrollParent: window
@@ -34,7 +34,7 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
-        provide(OptionsManager, {useValue: testOptions})
+        provide(OptionsService, {useValue: testOptions})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
diff --git a/lib/services/index.js b/lib/services/index.js
index 29de613a..c82c081e 100644
--- a/lib/services/index.js
+++ b/lib/services/index.js
@@ -1,3 +1,4 @@
 'use strict';
 
 export * from './events.service.js';
+export * from './options.service.js';
diff --git a/lib/options.js b/lib/services/options.service.js
similarity index 77%
rename from lib/options.js
rename to lib/services/options.service.js
index 3021c7cc..71288bba 100644
--- a/lib/options.js
+++ b/lib/services/options.service.js
@@ -1,22 +1,23 @@
 'use strict';
+import { Injectable } from '@angular/core';
+import { isFunction, isString } from '@angular/core/src/facade/lang';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { global } from '@angular/core/src/facade/lang';
 
-import {isFunction, isString} from '@angular/core/src/facade/lang';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-import {global} from '@angular/core/src/facade/lang';
-
-var defaults = {
+const defaults = {
   scrollYOffset: 0,
   disableLazySchemas: false,
-  debugMode: global.redocDebugMode
+  debugMode: global && global.redocDebugMode
 };
 
-var OPTION_NAMES = new Set(['scrollYOffset', 'disableLazySchemas', 'specUrl']);
+const OPTION_NAMES = new Set(['scrollYOffset', 'disableLazySchemas', 'specUrl']);
 
+@Injectable()
 @Reflect.metadata('parameters',  [[BrowserDomAdapter]])
-export default class OptionsManager {
-  constructor() {
+export class OptionsService {
+  constructor(dom) {
     this._options = defaults;
-    this.dom = new BrowserDomAdapter();
+    this.dom = dom;
   }
 
   get options() {
diff --git a/package.json b/package.json
index eaa30ff4..df404abb 100644
--- a/package.json
+++ b/package.json
@@ -69,9 +69,6 @@
         "map": {
           "http": "npm:stream-http@2.3.0"
         }
-      },
-      "npm:@angular/core@2.0.0-rc.1": {
-        "format": "esm"
       }
     }
   },
diff --git a/system.config.js b/system.config.js
index 6a373a24..e1c14140 100644
--- a/system.config.js
+++ b/system.config.js
@@ -33,9 +33,6 @@ System.config({
     },
     "jspm_packages/npm/json-schema-view-js@0.2.0/src/*": {
       "format": "esm"
-    },
-    "npm:@angular/**/*": {
-      "format": "esm"
     }
   },
 
@@ -149,6 +146,7 @@ System.config({
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:@angular/core@2.0.0-rc.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2",
       "rxjs": "npm:rxjs@5.0.0-beta.6",
       "zone.js": "npm:zone.js@0.6.12"
     },

From 96fc22d90bd0bee09561093f115b32fd330a636e Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Sat, 7 May 2016 10:54:44 +0300
Subject: [PATCH 05/14] moved logick to services

---
 lib/components/Redoc/redoc.js        |   3 +-
 lib/components/SideMenu/side-menu.js | 227 ++++-----------------------
 lib/services/events.service.js       |   2 +-
 lib/services/hash.service.js         |  33 ++++
 lib/services/index.js                |   3 +
 lib/services/menu.service.js         | 150 ++++++++++++++++++
 lib/services/scroll.service.js       |  66 ++++++++
 protractor.conf.js                   |   2 +-
 tests/e2e/redoc.spec.js              |   1 +
 9 files changed, 287 insertions(+), 200 deletions(-)
 create mode 100644 lib/services/hash.service.js
 create mode 100644 lib/services/menu.service.js
 create mode 100644 lib/services/scroll.service.js

diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index 6989a871..8c625620 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -2,8 +2,7 @@
 
 import { provide, enableProdMode, ElementRef} from '@angular/core';
 import { bootstrap } from '@angular/platform-browser-dynamic';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import { RedocComponent, BaseComponent } from '../base';
 import {
   ApiInfo,
diff --git a/lib/components/SideMenu/side-menu.js b/lib/components/SideMenu/side-menu.js
index c79e4b83..098c2cf4 100644
--- a/lib/components/SideMenu/side-menu.js
+++ b/lib/components/SideMenu/side-menu.js
@@ -5,231 +5,61 @@ import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser
 import { global } from '@angular/core/src/facade/lang';
 
 import { RedocComponent, BaseComponent, SchemaManager } from '../base';
-import { RedocEventsService } from '../../services/index';
-import { OptionsService } from '../../services/index';
-
-const CHANGE = {
-  NEXT : 1,
-  BACK : -1,
-  INITIAL : 0
-};
-
-const INVIEW_POSITION = {
-  ABOVE : 1,
-  BELLOW: -1,
-  INVIEW: 0
-};
+import { ScrollService, Hash, MenuService, OptionsService } from '../../services/index';
 
 @RedocComponent({
   selector: 'side-menu',
   templateUrl: './lib/components/SideMenu/side-menu.html',
+  providers: [ScrollService, MenuService, Hash],
   styleUrls: ['./lib/components/SideMenu/side-menu.css']
 })
 @Reflect.metadata('parameters', [[SchemaManager], [ElementRef],
-  [BrowserDomAdapter], [OptionsService], [RedocEventsService]])
+  [BrowserDomAdapter], [ScrollService], [MenuService], [Hash], [OptionsService]])
 export class SideMenu extends BaseComponent {
-  constructor(schemaMgr, elementRef, dom, optionsMgr, events) {
+  constructor(schemaMgr, elementRef, dom, scrollService, menuService, hash, optionsService) {
     super(schemaMgr);
     this.$element = elementRef.nativeElement;
     this.dom = dom;
-    this.options = optionsMgr.options;
-    this.$scrollParent = this.options.$scrollParent;
-
-    this.activeCatIdx = 0;
-    this.activeMethodIdx = -1;
-    this.prevOffsetY = null;
-
-    this.events = events;
+    this.scrollService = scrollService;
+    this.menuService = menuService;
+    this.hash = hash;
 
     this.activeCatCaption = '';
     this.activeItemCaption = '';
+
+    this.options = optionsService.options;
+
+    this.menuService.changed.subscribe(this.changed.bind(this));
   }
 
-  init() {
-    this.events.bootstrapped.subscribe(() => this.hashScroll());
-    this.bindEvents();
-    this.$mobileNav = this.dom.querySelector(this.$element, '.mobile-nav');
-    this.$resourcesNav = this.dom.querySelector(this.$element, '#resources-nav');
-    this.changeActive(CHANGE.INITIAL);
-  }
-
-  scrollY() {
-    return (this.$scrollParent.pageYOffset != null) ? this.$scrollParent.pageYOffset : this.$scrollParent.scrollTop;
-  }
-
-  hashScroll(evt) {
-    let hash = this.dom.getLocation().hash;
-    if (!hash) return;
-
-    let $el;
-    hash = hash.substr(1);
-    let namespace = hash.split('/')[0];
-    let ptr = decodeURIComponent(hash.substr(namespace.length + 1));
-    if (namespace === 'operation') {
-      $el = this.getMethodElByOperId(ptr);
-    } else if (namespace === 'tag') {
-      let tag = ptr.split('/')[0];
-      ptr = ptr.substr(tag.length);
-      $el = this.getMethodElByPtr(ptr, tag);
-    }
-
-    if ($el) this.scrollTo($el);
-    if (evt) evt.preventDefault();
-  }
-
-  bindEvents() {
-    this.prevOffsetY = this.scrollY();
-
-    //decorate option.scrollYOffset to account mobile nav
-    this.scrollYOffset = () => {
-      let mobileNavOffset = this.$mobileNav.clientHeight;
-      return this.options.scrollYOffset() + mobileNavOffset;
-    };
-    this._cancel = {};
-    this._cancel.scroll = this.dom.onAndCancel(this.$scrollParent, 'scroll', () => { this.scrollHandler(); });
-    this._cancel.hash = this.dom.onAndCancel(global, 'hashchange',  evt => this.hashScroll(evt));
-  }
-
-  destroy() {
-    this._cancel.scroll();
-    this._cancel.hash();
+  changed(cat, item) {
+    this.activeCatCaption = cat.name || '';
+    this.activeItemCaption = item && item.summary || '';
   }
 
   activateAndScroll(idx, methodIdx) {
     if (this.mobileMode()) {
       this.toggleMobileNav();
     }
-    this.activate(idx, methodIdx);
-    this.scrollToActive();
+    this.menuService.activate(idx, methodIdx);
+    this.menuService.scrollToActive();
   }
 
-  scrollTo($el) {
-    // TODO: rewrite this to use offsetTop as more reliable solution
-    let subjRect = $el.getBoundingClientRect();
-    let offset = this.scrollY() + subjRect.top - this.scrollYOffset() + 1;
-    if (this.$scrollParent.scrollTo) {
-      this.$scrollParent.scrollTo(0, offset);
-    } else {
-      this.$scrollParent.scrollTop = offset;
-    }
-  }
+  init() {
+    this.$mobileNav = this.dom.querySelector(this.$element, '.mobile-nav');
+    this.$resourcesNav = this.dom.querySelector(this.$element, '#resources-nav');
 
-  scrollToActive() {
-    this.scrollTo(this.getCurrentMethodEl());
-  }
-
-  activate(catIdx, methodIdx) {
-    let menu = this.data.menu;
-
-    this.activeCatCaption = '';
-    this.activeItemCaption = '';
-
-    menu[this.activeCatIdx].active = false;
-    if (menu[this.activeCatIdx].methods.length) {
-      if (this.activeMethodIdx >= 0) {
-        menu[this.activeCatIdx].methods[this.activeMethodIdx].active = false;
-      }
-   }
-
-    this.activeCatIdx = catIdx;
-    this.activeMethodIdx = methodIdx;
-    menu[catIdx].active = true;
-    this.activeCatCaption = menu[catIdx].name;
-    this.activeMethodPtr = null;
-    if (menu[catIdx].methods.length && (methodIdx > -1)) {
-      let currentItem = menu[catIdx].methods[methodIdx];
-      currentItem.active = true;
-      this.activeMethodPtr = currentItem.pointer;
-      this.activeItemCaption = currentItem.summary;
-    }
-  }
-
-  _calcActiveIndexes(offset) {
-    let menu = this.data.menu;
-    let catCount = menu.length;
-    let catLength = menu[this.activeCatIdx].methods.length;
-
-    let resMethodIdx = this.activeMethodIdx + offset;
-    let resCatIdx = this.activeCatIdx;
-
-    if (resMethodIdx > catLength - 1) {
-      resCatIdx++;
-      resMethodIdx = -1;
-    }
-    if (resMethodIdx < -1) {
-      let prevCatIdx = --resCatIdx;
-      catLength = menu[Math.max(prevCatIdx, 0)].methods.length;
-      resMethodIdx = catLength - 1;
-    }
-    if (resCatIdx > catCount - 1) {
-      resCatIdx = catCount - 1;
-      resMethodIdx = catLength - 1;
-    }
-    if (resCatIdx < 0) {
-      resCatIdx = 0;
-      resMethodIdx = 0;
-    }
-
-    return [resCatIdx, resMethodIdx];
-  }
-
-  changeActive(offset = 1) {
-    let [catIdx, methodIdx] = this._calcActiveIndexes(offset);
-    this.activate(catIdx, methodIdx);
-    return (methodIdx === 0 && catIdx === 0);
-  }
-
-  getMethodElByPtr(ptr, tag) {
-    let selector = ptr ? `[pointer="${ptr}"][tag="${tag}"]` : `[tag="${tag}"]`;
-    return document.querySelector(selector);
-  }
-
-  getMethodElByOperId(operationId) {
-    let selector =`[operation-id="${operationId}"]`;
-    return document.querySelector(selector);
-  }
-
-  getCurrentMethodEl() {
-    return this.getMethodElByPtr(this.activeMethodPtr, this.data.menu[this.activeCatIdx].name);
-  }
-
-  /* returns 1 if element if above the view, 0 if in view and -1 below the view */
-  getElementInViewPos($el) {
-    if (Math.floor($el.getBoundingClientRect().top) > this.scrollYOffset()) {
-      return INVIEW_POSITION.ABOVE;
-    }
-
-    if ($el.getBoundingClientRect().bottom <= this.scrollYOffset()) {
-      return INVIEW_POSITION.BELLOW;
-    }
-    return INVIEW_POSITION.INVIEW;
-  }
-
-  scrollHandler() {
-    let isScrolledDown = (this.scrollY() - this.prevOffsetY > 0);
-    this.prevOffsetY = this.scrollY();
-    let stable = false;
-    while(!stable) {
-      let $activeMethodHost = this.getCurrentMethodEl();
-      if (!$activeMethodHost) return;
-      var elementInViewPos = this.getElementInViewPos($activeMethodHost);
-      if(isScrolledDown && elementInViewPos === INVIEW_POSITION.BELLOW) {
-        stable = this.changeActive(CHANGE.NEXT);
-        continue;
-      }
-      if(!isScrolledDown && elementInViewPos === INVIEW_POSITION.ABOVE ) {
-        stable = this.changeActive(CHANGE.BACK);
-        continue;
-      }
-      stable = true;
-    }
+    //decorate option.scrollYOffset to account mobile nav
+    var origOffset = this.options.scrollYOffset;
+    this.options.scrollYOffset = () => {
+      let mobileNavOffset = this.$mobileNav.clientHeight;
+      return origOffset() + mobileNavOffset;
+    };
   }
 
   prepareModel() {
     this.data = {};
-    this.data.menu = Array.from(this.schemaMgr.buildMenuTree().entries()).map(
-      el => ({name: el[0], description: el[1].description, methods: el[1].methods})
-    );
+    this.data.menu = this.menuService.categories;
   }
 
   mobileMode() {
@@ -249,4 +79,9 @@ export class SideMenu extends BaseComponent {
       dom.setStyle(this.$resourcesNav, 'height', height + 'px');
     }
   }
+
+  destroy() {
+    this.scrollService.unbind();
+    this.hash.unbind();
+  }
 }
diff --git a/lib/services/events.service.js b/lib/services/events.service.js
index 4886b703..57cf41f9 100644
--- a/lib/services/events.service.js
+++ b/lib/services/events.service.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import {EventEmitter} from '@angular/core';
+import { EventEmitter } from '@angular/core';
 
 export class RedocEventsService {
   constructor() {
diff --git a/lib/services/hash.service.js b/lib/services/hash.service.js
new file mode 100644
index 00000000..60529be8
--- /dev/null
+++ b/lib/services/hash.service.js
@@ -0,0 +1,33 @@
+'use strict';
+import { Injectable, EventEmitter } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { global } from '@angular/core/src/facade/lang';
+
+import { RedocEventsService } from './events.service.js';
+
+@Reflect.metadata('parameters', [[BrowserDomAdapter], [RedocEventsService]])
+@Injectable()
+export class Hash {
+  constructor(dom, events) {
+    this.changed = new EventEmitter();
+    this.dom = dom;
+    this.bind();
+
+    events.bootstrapped.subscribe(() => this.changed.next(this.hash));
+  }
+
+  get hash() {
+    return this.dom.getLocation().hash;
+  }
+
+  bind() {
+    this._cancel = this.dom.onAndCancel(global, 'hashchange', (evt) => {
+      this.changed.next(this.hash);
+      evt.preventDefault();
+    });
+  }
+
+  unbind() {
+    this._cancel();
+  }
+}
diff --git a/lib/services/index.js b/lib/services/index.js
index c82c081e..c9962f48 100644
--- a/lib/services/index.js
+++ b/lib/services/index.js
@@ -2,3 +2,6 @@
 
 export * from './events.service.js';
 export * from './options.service.js';
+export * from './menu.service.js';
+export * from './scroll.service.js';
+export * from './hash.service.js';
diff --git a/lib/services/menu.service.js b/lib/services/menu.service.js
new file mode 100644
index 00000000..d3f1cce5
--- /dev/null
+++ b/lib/services/menu.service.js
@@ -0,0 +1,150 @@
+'use strict';
+import { Injectable, EventEmitter } from '@angular/core';
+import { ScrollService, INVIEW_POSITION } from './scroll.service.js';
+import { Hash } from './hash.service.js';
+import SchemaManager from '../utils/SchemaManager';
+
+const CHANGE = {
+  NEXT : 1,
+  BACK : -1,
+  INITIAL : 0
+};
+
+@Reflect.metadata('parameters', [[Hash], [ScrollService], [SchemaManager]])
+@Injectable()
+export class MenuService {
+  constructor(hash, scrollService, schemaMgr) {
+    this.hash = hash;
+    this.scrollService = scrollService;
+
+    this.activeCatIdx = 0;
+    this.activeMethodIdx = -1;
+    this.changed = new EventEmitter();
+
+    this.categories = Array.from(schemaMgr.buildMenuTree().entries()).map(
+      el => ({name: el[0], description: el[1].description, methods: el[1].methods})
+    );
+
+    scrollService.scroll.subscribe((evt) => {
+      this.scrollUpdate(evt.isScrolledDown);
+    });
+
+    this.changeActive(CHANGE.INITIAL);
+
+    this.hash.changed.subscribe(this.hashScroll.bind(this));
+  }
+
+  scrollUpdate(isScrolledDown) {
+    let stable = false;
+    while(!stable) {
+      let $activeMethodHost = this.getCurrentMethodEl();
+      if (!$activeMethodHost) return;
+      var elementInViewPos = this.scrollService.getElementPos($activeMethodHost);
+      if(isScrolledDown && elementInViewPos === INVIEW_POSITION.BELLOW) {
+        stable = this.changeActive(CHANGE.NEXT);
+        continue;
+      }
+      if(!isScrolledDown && elementInViewPos === INVIEW_POSITION.ABOVE ) {
+        stable = this.changeActive(CHANGE.BACK);
+        continue;
+      }
+      stable = true;
+    }
+  }
+
+  getCurrentMethodEl() {
+    return this.getMethodElByPtr(this.activeMethodPtr,
+      this.categories[this.activeCatIdx].name);
+  }
+
+  getMethodElByPtr(ptr, tag) {
+    let selector = ptr ? `[pointer="${ptr}"][tag="${tag}"]` : `[tag="${tag}"]`;
+    return document.querySelector(selector);
+  }
+
+  getMethodElByOperId(operationId) {
+    let selector =`[operation-id="${operationId}"]`;
+    return document.querySelector(selector);
+  }
+
+  activate(catIdx, methodIdx) {
+    let menu = this.categories;
+
+    menu[this.activeCatIdx].active = false;
+    if (menu[this.activeCatIdx].methods.length) {
+      if (this.activeMethodIdx >= 0) {
+        menu[this.activeCatIdx].methods[this.activeMethodIdx].active = false;
+      }
+   }
+
+    this.activeCatIdx = catIdx;
+    this.activeMethodIdx = methodIdx;
+    menu[catIdx].active = true;
+    this.activeMethodPtr = null;
+    let currentItem;
+    if (menu[catIdx].methods.length && (methodIdx > -1)) {
+      currentItem = menu[catIdx].methods[methodIdx];
+      currentItem.active = true;
+      this.activeMethodPtr = currentItem.pointer;
+    }
+
+    this.changed.next(menu[catIdx], currentItem);
+  }
+
+  _calcActiveIndexes(offset) {
+    let menu = this.categories;
+    let catCount = menu.length;
+    let catLength = menu[this.activeCatIdx].methods.length;
+
+    let resMethodIdx = this.activeMethodIdx + offset;
+    let resCatIdx = this.activeCatIdx;
+
+    if (resMethodIdx > catLength - 1) {
+      resCatIdx++;
+      resMethodIdx = -1;
+    }
+    if (resMethodIdx < -1) {
+      let prevCatIdx = --resCatIdx;
+      catLength = menu[Math.max(prevCatIdx, 0)].methods.length;
+      resMethodIdx = catLength - 1;
+    }
+    if (resCatIdx > catCount - 1) {
+      resCatIdx = catCount - 1;
+      resMethodIdx = catLength - 1;
+    }
+    if (resCatIdx < 0) {
+      resCatIdx = 0;
+      resMethodIdx = 0;
+    }
+
+    return [resCatIdx, resMethodIdx];
+  }
+
+  changeActive(offset = 1) {
+    let [catIdx, methodIdx] = this._calcActiveIndexes(offset);
+    this.activate(catIdx, methodIdx);
+    return (methodIdx === 0 && catIdx === 0);
+  }
+
+  scrollToActive() {
+    this.scrollService.scrollTo(this.getCurrentMethodEl());
+  }
+
+  hashScroll(hash) {
+    if (!hash) return;
+
+    let $el;
+    hash = hash.substr(1);
+    let namespace = hash.split('/')[0];
+    let ptr = decodeURIComponent(hash.substr(namespace.length + 1));
+    if (namespace === 'operation') {
+      $el = this.getMethodElByOperId(ptr);
+    } else if (namespace === 'tag') {
+      let tag = ptr.split('/')[0];
+      ptr = ptr.substr(tag.length);
+      $el = this.getMethodElByPtr(ptr, tag);
+    }
+
+    if ($el) this.scrollService.scrollTo($el);
+  }
+}
diff --git a/lib/services/scroll.service.js b/lib/services/scroll.service.js
new file mode 100644
index 00000000..6daa83fb
--- /dev/null
+++ b/lib/services/scroll.service.js
@@ -0,0 +1,66 @@
+'use strict';
+import { Injectable, EventEmitter } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { OptionsService } from './options.service.js';
+
+export const INVIEW_POSITION = {
+  ABOVE : 1,
+  BELLOW: -1,
+  INVIEW: 0
+};
+
+@Reflect.metadata('parameters', [
+  [BrowserDomAdapter], [OptionsService]])
+@Injectable()
+export class ScrollService {
+  constructor(dom, optionsService) {
+    //events.bootstrapped.subscribe(() => this.hashScroll());
+    this.scrollYOffset = () => optionsService.options.scrollYOffset();
+    this.$scrollParent = optionsService.options.$scrollParent;
+    this.scroll = new EventEmitter();
+    this.dom = dom;
+    this.bind();
+  }
+
+  scrollY() {
+    return (this.$scrollParent.pageYOffset != null) ? this.$scrollParent.pageYOffset : this.$scrollParent.scrollTop;
+  }
+
+  /* returns 1 if element if above the view, 0 if in view and -1 below the view */
+  getElementPos($el) {
+    if (Math.floor($el.getBoundingClientRect().top) > this.scrollYOffset()) {
+      return INVIEW_POSITION.ABOVE;
+    }
+
+    if ($el.getBoundingClientRect().bottom <= this.scrollYOffset()) {
+      return INVIEW_POSITION.BELLOW;
+    }
+    return INVIEW_POSITION.INVIEW;
+  }
+
+  scrollTo($el) {
+    // TODO: rewrite this to use offsetTop as more reliable solution
+    let subjRect = $el.getBoundingClientRect();
+    let offset = this.scrollY() + subjRect.top - this.scrollYOffset() + 1;
+    if (this.$scrollParent.scrollTo) {
+      this.$scrollParent.scrollTo(0, offset);
+    } else {
+      this.$scrollParent.scrollTop = offset;
+    }
+  }
+
+  scrollHandler(evt) {
+    let isScrolledDown = (this.scrollY() - this.prevOffsetY > 0);
+    this.prevOffsetY = this.scrollY();
+    this.scroll.next({isScrolledDown, evt});
+  }
+
+  bind() {
+    this.prevOffsetY = this.scrollY();
+    this._cancel = this.dom.onAndCancel(this.$scrollParent, 'scroll', (evt) => { this.scrollHandler(evt); });
+  }
+
+  unbind() {
+    this._cancel();
+  }
+}
diff --git a/protractor.conf.js b/protractor.conf.js
index f50b1ec2..e4fdcfd8 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -14,7 +14,7 @@ let config = {
     return loadJson('https://apis-guru.github.io/api-models/api/v1/list.json').then((list) => {
       global.apisGuruList = list;
       return browser.getCapabilities().then(function (cap) {
-        browser.isIE = cap.caps_.browserName === 'internet explorer';
+        browser.isIE = cap.browserName === 'internet explorer';
       });
     });
   },
diff --git a/tests/e2e/redoc.spec.js b/tests/e2e/redoc.spec.js
index 7db651ce..bc1fd6be 100644
--- a/tests/e2e/redoc.spec.js
+++ b/tests/e2e/redoc.spec.js
@@ -1,4 +1,5 @@
 'use strict';
+console.log('here');
 const verifyNoBrowserErrors = require('./helpers').verifyNoBrowserErrors;
 const scrollToEl = require('./helpers').scrollToEl;
 const fixFFTest = require('./helpers').fixFFTest;

From ed20f784dbdeb17c3f0dabc98956e949a07ec50d Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Mon, 9 May 2016 22:55:16 +0300
Subject: [PATCH 06/14] Update tests

---
 lib/components/ApiInfo/api-info.spec.js       |   8 +-
 lib/components/ApiLogo/api-logo.spec.js       |   2 +-
 lib/components/JsonSchema/json-schema-lazy.js |  18 +-
 .../JsonSchema/json-schema-lazy.spec.js       |   2 +-
 lib/components/JsonSchema/json-schema.js      |   2 +-
 lib/components/JsonSchema/json-schema.spec.js |   2 +-
 lib/components/Method/method.js               |  20 +-
 lib/components/Method/method.spec.js          |   7 +-
 lib/components/MethodsList/methods-list.js    |   7 +-
 .../MethodsList/methods-list.spec.js          |  20 +-
 lib/components/ParamsList/params-list.js      |   3 +-
 lib/components/Redoc/redoc.js                 |  16 +-
 lib/components/Redoc/redoc.spec.js            |  67 +------
 .../RequestSamples/request-samples.js         |   8 +-
 .../ResponsesList/responses-list.js           |   7 +-
 lib/components/SideMenu/side-menu.spec.js     | 181 +++---------------
 lib/components/base.spec.js                   |   2 +-
 lib/components/index.js                       |   3 +-
 lib/services/hash.service.js                  |   2 +-
 lib/services/hash.service.spec.js             |  28 +++
 lib/services/menu.service.js                  |   4 +-
 lib/services/menu.service.spec.js             | 126 ++++++++++++
 lib/services/options.service.spec.js          |  55 ++++++
 .../StickySidebar/sticky-sidebar.spec.js      |   5 +-
 lib/shared/components/Tabs/tabs.spec.js       |   5 +-
 lib/shared/components/Zippy/zippy.spec.js     |   4 +-
 tests/setup.js                                |  14 +-
 27 files changed, 326 insertions(+), 292 deletions(-)
 create mode 100644 lib/services/hash.service.spec.js
 create mode 100644 lib/services/menu.service.spec.js
 create mode 100644 lib/services/options.service.spec.js

diff --git a/lib/components/ApiInfo/api-info.spec.js b/lib/components/ApiInfo/api-info.spec.js
index e72e4f4e..a9c2d990 100644
--- a/lib/components/ApiInfo/api-info.spec.js
+++ b/lib/components/ApiInfo/api-info.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
+import { Component, provide } from '@angular/core';
 
 import {
   inject,
@@ -13,7 +13,7 @@ import {
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import ApiInfo from 'lib/components/ApiInfo/api-info';
+import { ApiInfo } from 'lib/components/ApiInfo/api-info';
 import SchemaManager from 'lib/utils/SchemaManager';
 import { OptionsService } from 'lib/services/index';
 
@@ -40,7 +40,9 @@ describe('Redoc components', () => {
         component = getChildDebugElement(fixture.debugElement, 'api-info').componentInstance;
         fixture.detectChanges();
         done();
-      }, err => done.fail(err));
+      }, err => {
+        done.fail(err);
+      });
     });
 
 
diff --git a/lib/components/ApiLogo/api-logo.spec.js b/lib/components/ApiLogo/api-logo.spec.js
index dec6e5a3..a156aacb 100644
--- a/lib/components/ApiLogo/api-logo.spec.js
+++ b/lib/components/ApiLogo/api-logo.spec.js
@@ -13,7 +13,7 @@ import {
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import ApiLogo from 'lib/components/ApiLogo/api-logo';
+import { ApiLogo } from 'lib/components/ApiLogo/api-logo';
 import SchemaManager from 'lib/utils/SchemaManager';
 
 
diff --git a/lib/components/JsonSchema/json-schema-lazy.js b/lib/components/JsonSchema/json-schema-lazy.js
index 560118e6..d532ef6a 100644
--- a/lib/components/JsonSchema/json-schema-lazy.js
+++ b/lib/components/JsonSchema/json-schema-lazy.js
@@ -42,7 +42,11 @@ export class JsonSchemaLazy {
       this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
         this.initComponent(compRef);
         // trigger change detection
-        compRef.changeDetectorRef.detectChanges();
+        if (compRef.changeDetectorRef) {
+          compRef.changeDetectorRef.detectChanges();
+        } else {
+          compRef.hostView.changeDetectorRef.detectChanges();
+        }
       });
     }
     this.loaded = true;
@@ -61,7 +65,11 @@ export class JsonSchemaLazy {
           if ($element.querySelector('.discriminator-wrap')) {
             this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
               this.initComponent(compRef);
-              compRef.changeDetectorRef.detectChanges();
+              if (compRef.changeDetectorRef) {
+                compRef.changeDetectorRef.detectChanges();
+              } else {
+                compRef.hostView.changeDetectorRef.detectChanges();
+              }
             });
             return;
           }
@@ -71,7 +79,11 @@ export class JsonSchemaLazy {
     } else {
       cache[this.pointer] = this.dcl.loadNextToLocation(JsonSchema, this.viewRef).then((compRef) => {
         this.initComponent(compRef);
-        compRef.changeDetectorRef.detectChanges();
+        if (compRef.changeDetectorRef) {
+          compRef.changeDetectorRef.detectChanges();
+        } else {
+          compRef.hostView.changeDetectorRef.detectChanges();
+        }
         return compRef;
       });
     }
diff --git a/lib/components/JsonSchema/json-schema-lazy.spec.js b/lib/components/JsonSchema/json-schema-lazy.spec.js
index 2b921abe..5e09b679 100644
--- a/lib/components/JsonSchema/json-schema-lazy.spec.js
+++ b/lib/components/JsonSchema/json-schema-lazy.spec.js
@@ -15,7 +15,7 @@ import {
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
 
-import JsonSchemaLazy from 'lib/components/JsonSchema/json-schema-lazy';
+import { JsonSchemaLazy } from 'lib/components/JsonSchema/json-schema-lazy';
 import SchemaManager from 'lib/utils/SchemaManager';
 import { OptionsService } from 'lib/services/index';
 
diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index 3059e845..26b8277f 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -3,7 +3,7 @@
 import { ElementRef } from '@angular/core';
 
 import { RedocComponent, BaseComponent, SchemaManager } from '../base';
-import { DropDown } from '../..//shared/components/index';
+import { DropDown } from '../../shared/components/index';
 import JsonPointer from '../../utils/JsonPointer';
 
 @RedocComponent({
diff --git a/lib/components/JsonSchema/json-schema.spec.js b/lib/components/JsonSchema/json-schema.spec.js
index 1b0d197d..dcca663f 100644
--- a/lib/components/JsonSchema/json-schema.spec.js
+++ b/lib/components/JsonSchema/json-schema.spec.js
@@ -13,7 +13,7 @@ import { OptionsService } from 'lib/services/index';
 import { getChildDebugElement } from 'tests/helpers';
 
 
-import { JsonSchema } from 'lib/components/index';
+import { JsonSchema } from 'lib/components/JsonSchema/json-schema';
 import SchemaManager from 'lib/utils/SchemaManager';
 
 describe('Redoc components', () => {
diff --git a/lib/components/Method/method.js b/lib/components/Method/method.js
index d2ac94fa..0070788c 100644
--- a/lib/components/Method/method.js
+++ b/lib/components/Method/method.js
@@ -1,27 +1,19 @@
 'use strict';
 
-import { forwardRef } from '@angular/core';
 import { JsonPointer } from '../../utils/JsonPointer';
 import { RedocComponent, BaseComponent } from '../base';
 
-import {
-  ParamsList,
-  ResponsesList,
-  ResponsesSamples,
-  SchemaSample,
-  RequestSamples
-} from '../index';
+import { ParamsList } from '../ParamsList/params-list';
+import { ResponsesList } from '../ResponsesList/responses-list';
+import { ResponsesSamples } from '../ResponsesSamples/responses-samples';
+import { SchemaSample } from '../SchemaSample/schema-sample';
+import { RequestSamples } from '../RequestSamples/request-samples';
 
 @RedocComponent({
   selector: 'method',
   templateUrl: './lib/components/Method/method.html',
   styleUrls: ['./lib/components/Method/method.css'],
-  directives: [
-    forwardRef(() => ParamsList),
-    forwardRef(() => ResponsesList),
-    forwardRef(() => ResponsesSamples),
-    forwardRef(() => SchemaSample),
-    forwardRef(() => RequestSamples)],
+  directives: [ ParamsList, ResponsesList, ResponsesSamples, SchemaSample, RequestSamples ],
   inputs: ['tag']
 })
 export class Method extends BaseComponent {
diff --git a/lib/components/Method/method.spec.js b/lib/components/Method/method.spec.js
index dab81d1c..dd17c099 100644
--- a/lib/components/Method/method.spec.js
+++ b/lib/components/Method/method.spec.js
@@ -13,9 +13,9 @@ import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import { getChildDebugElement } from 'tests/helpers';
 
-import { Method } from 'lib/components/index';
+import { Method } from 'lib/components/Method/method';
 import SchemaManager from 'lib/utils/SchemaManager';
-import OptionsService from 'lib/services/index';
+import { OptionsService, RedocEventsService } from 'lib/services/index';
 
 describe('Redoc components', () => {
   describe('Method Component', () => {
@@ -24,7 +24,8 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
-        provide(OptionsService, {useClass: OptionsService})
+        provide(OptionsService, {useClass: OptionsService}),
+        provide(RedocEventsService, {useClass: RedocEventsService})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
diff --git a/lib/components/MethodsList/methods-list.js b/lib/components/MethodsList/methods-list.js
index 169e5a61..c9a55f3f 100644
--- a/lib/components/MethodsList/methods-list.js
+++ b/lib/components/MethodsList/methods-list.js
@@ -1,15 +1,16 @@
 'use strict';
 
+import { forwardRef } from '@angular/core';
 import { RedocComponent, BaseComponent } from '../base';
-import { Method } from '../index';
+import { Method } from '../Method/method';
 import { EncodeURIComponentPipe } from '../../utils/pipes';
 
 @RedocComponent({
   selector: 'methods-list',
   templateUrl: './lib/components/MethodsList/methods-list.html',
   styleUrls: ['./lib/components/MethodsList/methods-list.css'],
-  directives: [Method],
-  pipes: [EncodeURIComponentPipe]
+  directives: [ forwardRef(() => Method) ],
+  pipes: [ EncodeURIComponentPipe ]
 })
 export class MethodsList extends BaseComponent {
 
diff --git a/lib/components/MethodsList/methods-list.spec.js b/lib/components/MethodsList/methods-list.spec.js
index 8d3e6ba5..76aaccbc 100644
--- a/lib/components/MethodsList/methods-list.spec.js
+++ b/lib/components/MethodsList/methods-list.spec.js
@@ -1,10 +1,7 @@
 'use strict';
 
-import { getChildDebugElement } from 'tests/helpers';
-import {Component, provide} from '@angular/core';
-import { OptionsService } from 'lib/services/index';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-
+import { Component, provide } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import {
   inject,
   async,
@@ -12,10 +9,12 @@ import {
   beforeEachProviders,
   it
 } from '@angular/core/testing';
-
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import MethodsList from 'lib/components/MethodsList/methods-list';
+import { getChildDebugElement } from 'tests/helpers';
+
+import { OptionsService, RedocEventsService } from 'lib/services/index';
+import { MethodsList } from 'lib/components/MethodsList/methods-list';
 import SchemaManager from 'lib/utils/SchemaManager';
 
 describe('Redoc components', () => {
@@ -26,7 +25,8 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(OptionsService, {useClass: OptionsService}),
-        provide(BrowserDomAdapter, {useClass: BrowserDomAdapter})
+        provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
+        provide(RedocEventsService, {useClass: RedocEventsService})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
@@ -57,11 +57,9 @@ describe('Redoc components', () => {
   });
 });
 
-/** Test component that contains an ApiInfo. */
 @Component({
   selector: 'test-app',
-  directives: [MethodsList],
-  providers: [SchemaManager],
+  directives: [ MethodsList ],
   template:
       `<methods-list></methods-list>`
 })
diff --git a/lib/components/ParamsList/params-list.js b/lib/components/ParamsList/params-list.js
index 1aef52a4..51486cfc 100644
--- a/lib/components/ParamsList/params-list.js
+++ b/lib/components/ParamsList/params-list.js
@@ -1,7 +1,8 @@
 'use strict';
 
 import { RedocComponent, BaseComponent } from '../base';
-import { JsonSchema, JsonSchemaLazy } from '../index';
+import { JsonSchema } from '../JsonSchema/json-schema';
+import {JsonSchemaLazy} from '../JsonSchema/json-schema-lazy';
 
 function safePush(obj, prop, item) {
   if (!obj[prop]) obj[prop] = [];
diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index 8c625620..76669ded 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -1,15 +1,15 @@
 'use strict';
 
-import { provide, enableProdMode, ElementRef} from '@angular/core';
+import { provide, enableProdMode, ElementRef } from '@angular/core';
 import { bootstrap } from '@angular/platform-browser-dynamic';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import { RedocComponent, BaseComponent } from '../base';
-import {
-  ApiInfo,
-  ApiLogo,
-  MethodsList,
-  SideMenu
-} from '../index';
+
+import { ApiInfo } from '../ApiInfo/api-info';
+import { ApiLogo } from '../ApiLogo/api-logo';
+import { MethodsList } from '../MethodsList/methods-list';
+import { SideMenu } from '../SideMenu/side-menu';
+
 import { StickySidebar } from '../../shared/components/index';
 import SchemaManager from '../../utils/SchemaManager';
 import { OptionsService, RedocEventsService } from '../../services/index';
@@ -29,7 +29,7 @@ var _modeLocked = false;
   ],
   templateUrl: './lib/components/Redoc/redoc.html',
   styleUrls: ['./lib/components/Redoc/redoc.css'],
-  directives: [ApiInfo, ApiLogo, MethodsList, SideMenu, StickySidebar]
+  directives: [ ApiInfo, ApiLogo, MethodsList, SideMenu, StickySidebar ]
 })
 @Reflect.metadata('parameters', [
   [SchemaManager], [OptionsService], [ElementRef], [RedocEventsService]])
diff --git a/lib/components/Redoc/redoc.spec.js b/lib/components/Redoc/redoc.spec.js
index 1a5fcae1..d4cd8289 100644
--- a/lib/components/Redoc/redoc.spec.js
+++ b/lib/components/Redoc/redoc.spec.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { getChildDebugElement } from 'tests/helpers';
-import {Component, ViewMetadata, provide} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
+import { Component, provide } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
   inject,
@@ -14,11 +14,11 @@ import {
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import Redoc from 'lib/components/Redoc/redoc';
+import { Redoc } from 'lib/components/Redoc/redoc';
 import SchemaManager from 'lib/utils/SchemaManager';
 import { OptionsService } from 'lib/services/index';
 
-let optsMgr = new OptionsService();
+let optsMgr = new OptionsService(new BrowserDomAdapter());
 
 describe('Redoc components', () => {
   describe('Redoc Component', () => {
@@ -28,6 +28,9 @@ describe('Redoc components', () => {
         provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
         provide(OptionsService, {useValue: optsMgr})
     ]);
+    beforeEachProviders(() => [
+        provide(OptionsService, {useValue: optsMgr})
+    ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
       return schemaMgr.load('/tests/schemas/extended-petstore.yml');
@@ -50,62 +53,6 @@ describe('Redoc components', () => {
         done();
       }, err => done.fail(err));
     });
-
-    describe('Options', () => {
-      let component;
-      let fixture;
-
-      function build(tmpl, cb) {
-        builder = builder.overrideView(TestApp,
-          new ViewMetadata({template: tmpl, directives: [Redoc]}));
-        builder.createAsync(TestApp).then(_fixture => {
-          fixture = _fixture;
-          component = getChildDebugElement(fixture.debugElement, 'redoc').componentInstance;
-          fixture.detectChanges();
-          cb();
-        }, err => cb(err));
-      }
-
-      afterEach(() => {
-        fixture.destroy();
-      });
-
-      it('should parse numeric scrollYOffset', (done) => {
-        build(`<redoc scroll-y-offset="50"></redoc>`, err => {
-          if (err) return done.fail(err);
-          component.options.scrollYOffset().should.be.equal(50);
-          done();
-        });
-      });
-
-      it('should parse selector scrollYOffset', (done) => {
-        build(`<div id="test" style="position: fixed; height: 50px; top:0"> </div>
-              <redoc scroll-y-offset="#test"></redoc>`, err => {
-          if (err) return done.fail(err);
-          component.options.scrollYOffset().should.be.equal(50);
-          done();
-        });
-      });
-
-      it('should return 0 for incorrect selector scrollYOffset', (done) => {
-        build(`<div id="test" style="position: fixed; height: 50px; top:0"> </div>
-              <redoc scroll-y-offset="#test2"></redoc>`, err => {
-          if (err) return done.fail(err);
-          component.options.scrollYOffset().should.be.equal(0);
-          done();
-        });
-      });
-
-      it('should handle function scrollYOffset', (done) => {
-        optsMgr.options.scrollYOffset = () => 123;
-        build(`<redoc></redoc>`, err => {
-          if (err) return done.fail(err);
-          component.options.scrollYOffset().should.be.equal(123);
-          optsMgr.options.scrollYOffset = 0;
-          done();
-        });
-      });
-    });
   });
 
   describe('Redoc init', () => {
diff --git a/lib/components/RequestSamples/request-samples.js b/lib/components/RequestSamples/request-samples.js
index c8c65408..96168c0e 100644
--- a/lib/components/RequestSamples/request-samples.js
+++ b/lib/components/RequestSamples/request-samples.js
@@ -1,11 +1,11 @@
 'use strict';
 
-import { forwardRef, ViewChildren, QueryList } from '@angular/core';
+import { ViewChildren, QueryList } from '@angular/core';
 
 import { RedocComponent, BaseComponent, SchemaManager } from '../base';
 import JsonPointer from '../../utils/JsonPointer';
-import { Tabs, Tab } from '../..//shared/components/index';
-import { SchemaSample } from '../index';
+import { Tabs, Tab } from '../../shared/components/index';
+import { SchemaSample } from '../SchemaSample/schema-sample';
 import { PrismPipe } from '../../utils/pipes';
 import { RedocEventsService } from '../../services/index';
 
@@ -13,7 +13,7 @@ import { RedocEventsService } from '../../services/index';
   selector: 'request-samples',
   templateUrl: './lib/components/RequestSamples/request-samples.html',
   styleUrls: ['./lib/components/RequestSamples/request-samples.css'],
-  directives: [forwardRef(() =>SchemaSample), Tabs, Tab],
+  directives: [SchemaSample, Tabs, Tab],
   inputs: ['schemaPointer'],
   pipes: [PrismPipe]
 })
diff --git a/lib/components/ResponsesList/responses-list.js b/lib/components/ResponsesList/responses-list.js
index 6567861f..3830845c 100644
--- a/lib/components/ResponsesList/responses-list.js
+++ b/lib/components/ResponsesList/responses-list.js
@@ -2,9 +2,10 @@
 
 import {RedocComponent, BaseComponent, SchemaManager} from '../base';
 import JsonPointer from '../../utils/JsonPointer';
-import { JsonSchema, JsonSchemaLazy } from '../index';
-import {Zippy} from '../../shared/components/index';
-import {statusCodeType} from '../../utils/helpers';
+import { JsonSchema } from '../JsonSchema/json-schema';
+import { JsonSchemaLazy } from '../JsonSchema/json-schema-lazy';
+import { Zippy } from '../../shared/components/index';
+import { statusCodeType } from '../../utils/helpers';
 import { OptionsService } from '../../services/index';
 
 function isNumeric(n) {
diff --git a/lib/components/SideMenu/side-menu.spec.js b/lib/components/SideMenu/side-menu.spec.js
index 55d53019..a43fc357 100644
--- a/lib/components/SideMenu/side-menu.spec.js
+++ b/lib/components/SideMenu/side-menu.spec.js
@@ -1,9 +1,9 @@
 'use strict';
 
-import { getChildDebugElement, mouseclick} from 'tests/helpers';
-import {Component, provide, ViewMetadata} from '@angular/core';
-import {BrowserDomAdapter} from '@angular/platform-browser/src/browser/browser_adapter';
-import { OptionsService } from 'lib/services/index';
+import { getChildDebugElement } from 'tests/helpers';
+import { Component, provide } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import { OptionsService, RedocEventsService } from 'lib/services/index';
 
 import {
   inject,
@@ -15,9 +15,8 @@ import {
 
 import { TestComponentBuilder } from '@angular/compiler/testing';
 
-import {redocEvents} from 'lib/events';
-import MethodsList from 'lib/components/MethodsList/methods-list';
-import SideMenu from 'lib/components/SideMenu/side-menu';
+import { MethodsList, SideMenu } from 'lib/components/index';
+
 import SchemaManager from 'lib/utils/SchemaManager';
 
 let testOptions = new OptionsService();
@@ -26,6 +25,8 @@ testOptions.options = {
   scrollParent: window
 };
 
+let redocEvents = new RedocEventsService();
+
 describe('Redoc components', () => {
   describe('SideMenu Component', () => {
     let builder;
@@ -34,165 +35,32 @@ describe('Redoc components', () => {
     beforeEachProviders(() => [
         provide(SchemaManager, {useValue: new SchemaManager()}),
         provide(BrowserDomAdapter, {useValue: new BrowserDomAdapter()}),
-        provide(OptionsService, {useValue: testOptions})
+        provide(OptionsService, {useValue: testOptions}),
+        provide(RedocEventsService, {useValue: redocEvents})
     ]);
     beforeEach(async(inject([TestComponentBuilder, SchemaManager], (tcb, schemaMgr) => {
       builder = tcb;
       return schemaMgr.load('/tests/schemas/extended-petstore.yml');
     })));
 
+    beforeEach((done) => {
+      builder.createAsync(TestApp).then(_fixture => {
+        fixture = _fixture;
+        component = getChildDebugElement(fixture.debugElement, 'side-menu').componentInstance;
+        fixture.detectChanges();
+        done();
+      }, err => {
+        throw err;
+      });
+    });
+
     afterEach(() => {
       if (fixture) fixture.destroy();
     });
 
-    describe('window parent case', () => {
-      beforeEach((done) => {
-        builder.createAsync(TestApp).then(_fixture => {
-          fixture = _fixture;
-          component = getChildDebugElement(fixture.debugElement, 'side-menu').componentInstance;
-          fixture.detectChanges();
-          done();
-        }, err => {
-          throw err;
-        });
-      });
-
-      it('should init component and component data', () => {
-        expect(component).not.toBeNull();
-        expect(component.data).not.toBeNull();
-      });
-
-      it('should run hashScroll when redoc bootstrapped', (done) => {
-        spyOn(component.dom, 'getLocation').and.returnValue({hash: ''});
-        spyOn(component, 'hashScroll').and.stub();
-        spyOn(window, 'scrollTo').and.stub();
-        redocEvents.bootstrapped.next();
-        setTimeout(() => {
-          expect(component.hashScroll).toHaveBeenCalled();
-          expect(window.scrollTo).not.toHaveBeenCalled();
-
-          window.scrollTo.and.callThrough();
-          component.hashScroll.and.callThrough();
-          done();
-        });
-      });
-
-      it('should scroll to method when location hash is present [jp]', (done) => {
-        let hash = '#tag/pet/paths/~1pet~1findByStatus/get';
-        spyOn(component.dom, 'getLocation').and.returnValue({hash: hash});
-        spyOn(component, 'hashScroll').and.callThrough();
-        spyOn(window, 'scrollTo').and.stub();
-        redocEvents.bootstrapped.next();
-        setTimeout(() => {
-          expect(component.hashScroll).toHaveBeenCalled();
-          let scrollY = window.scrollTo.calls.argsFor(0)[1];
-          expect(scrollY).toBeGreaterThan(0);
-          done();
-        });
-      });
-
-      it('should scroll to method when location hash is present [operation]', (done) => {
-        let hash = '#operation/getPetById';
-        spyOn(component.dom, 'getLocation').and.returnValue({hash: hash});
-        spyOn(component, 'hashScroll').and.callThrough();
-        spyOn(window, 'scrollTo').and.stub();
-        redocEvents.bootstrapped.next();
-        setTimeout(() => {
-          expect(component.hashScroll).toHaveBeenCalled();
-          let scrollY = window.scrollTo.calls.argsFor(0)[1];
-          expect(scrollY).toBeGreaterThan(0);
-          done();
-        });
-      });
-    });
-
-    describe('scrollable div parent case', () => {
-      let menuNativeEl;
-      beforeEach((done) => {
-        let scollableDivTmpl =
-          `<div style="height: 500px; overflow-y: auto;">
-            <side-menu></side-menu>
-            <methods-list></methods-list>
-          </div>`;
-        builder = builder.overrideView(
-          TestApp, new ViewMetadata({template: scollableDivTmpl, directives: [MethodsList, SideMenu]}));
-        builder.createAsync(TestApp).then(_fixture => {
-          fixture = _fixture;
-          component = getChildDebugElement(fixture.debugElement, 'side-menu').componentInstance;
-          menuNativeEl = getChildDebugElement(fixture.debugElement, 'side-menu').nativeElement;
-          component.options.scrollParent = _fixture.nativeElement.children[0];
-          component.$scrollParent = _fixture.nativeElement.children[0];
-          fixture.detectChanges();
-          done();
-        }, err => {
-          throw err;
-        });
-      });
-
-
-
-      it('should init component and component data', () => {
-        expect(component).not.toBeNull();
-        expect(component.data).not.toBeNull();
-      });
-
-      it('should scroll to method when location hash is present [jp]', (done) => {
-        let hash = '#tag/pet/paths/~1pet~1findByStatus/get';
-        spyOn(component.dom, 'getLocation').and.returnValue({hash: hash});
-        spyOn(component, 'hashScroll').and.callThrough();
-        redocEvents.bootstrapped.next();
-        setTimeout(() => {
-          expect(component.hashScroll).toHaveBeenCalled();
-          expect(component.$scrollParent.scrollTop).toBeGreaterThan(0);
-          done();
-        });
-      });
-
-      it('should scroll to method when location hash is present [operation]', (done) => {
-        let hash = '#operation/getPetById';
-        spyOn(component.dom, 'getLocation').and.returnValue({hash: hash});
-        spyOn(component, 'hashScroll').and.callThrough();
-        redocEvents.bootstrapped.next();
-        setTimeout(() => {
-          expect(component.hashScroll).toHaveBeenCalled();
-          expect(component.$scrollParent.scrollTop).toBeGreaterThan(0);
-          done();
-        });
-      });
-
-      it('should select next/prev menu item when scrolled down/up', () => {
-        component.activeCatIdx.should.be.equal(0);
-        component.activeMethodIdx.should.be.equal(-1);
-        let elTop = component.getCurrentMethodEl().getBoundingClientRect().bottom;
-
-        component.$scrollParent.scrollTop = elTop + 1;
-        //simulate scroll down
-        spyOn(component, 'scrollY').and.returnValue(elTop + 2);
-        component.scrollHandler();
-        component.activeCatIdx.should.be.equal(1);
-
-
-        component.$scrollParent.scrollTop = elTop - 1;
-        //simulate scroll up
-        component.scrollY.and.returnValue(elTop - 2);
-        component.scrollHandler();
-        component.activeCatIdx.should.be.equal(0);
-      });
-
-      it('should activate menu item on click', () => {
-        let menuItemEl = menuNativeEl.querySelector('li');
-        expect(menuItemEl).not.toHaveCssClass('active');
-        mouseclick(menuItemEl);
-        fixture.detectChanges();
-        expect(menuItemEl).toHaveCssClass('active');
-      });
-
-      it('should scroll to appropriate element when click on menu label', () => {
-        component.$scrollParent.scrollTop.should.be.equal(0);
-        let menuItemEl = menuNativeEl.querySelector('li');
-        mouseclick(menuItemEl);
-        component.$scrollParent.scrollTop.should.be.above(0);
-      });
+    it('should init component and component data', () => {
+      expect(component).not.toBeNull();
+      expect(component.data).not.toBeNull();
     });
   });
 });
@@ -201,7 +69,6 @@ describe('Redoc components', () => {
 @Component({
   selector: 'test-app',
   directives: [MethodsList, SideMenu],
-  providers: [SchemaManager],
   template:
       `<side-menu></side-menu>
       <methods-list></methods-list>`
diff --git a/lib/components/base.spec.js b/lib/components/base.spec.js
index 8042b3e1..6038dbbd 100644
--- a/lib/components/base.spec.js
+++ b/lib/components/base.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import SchemaManager from 'lib/utils/SchemaManager';
-import {BaseComponent} from 'lib/components/base';
+import { BaseComponent } from 'lib/components/base';
 
 describe('Redoc components', () => {
   describe('BaseComponent', () => {
diff --git a/lib/components/index.js b/lib/components/index.js
index 941ae2a4..d6959eb3 100644
--- a/lib/components/index.js
+++ b/lib/components/index.js
@@ -10,6 +10,7 @@ export * from './ResponsesList/responses-list';
 export * from './ResponsesSamples/responses-samples';
 export * from './SchemaSample/schema-sample';
 export * from './SideMenu/side-menu';
-export * from './Method/method';
 export * from './MethodsList/methods-list';
+export * from './Method/method';
+
 export * from './Redoc/redoc';
diff --git a/lib/services/hash.service.js b/lib/services/hash.service.js
index 60529be8..588df861 100644
--- a/lib/services/hash.service.js
+++ b/lib/services/hash.service.js
@@ -3,7 +3,7 @@ import { Injectable, EventEmitter } from '@angular/core';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import { global } from '@angular/core/src/facade/lang';
 
-import { RedocEventsService } from './events.service.js';
+import { RedocEventsService } from './events.service';
 
 @Reflect.metadata('parameters', [[BrowserDomAdapter], [RedocEventsService]])
 @Injectable()
diff --git a/lib/services/hash.service.spec.js b/lib/services/hash.service.spec.js
new file mode 100644
index 00000000..80fba625
--- /dev/null
+++ b/lib/services/hash.service.spec.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+
+import { RedocEventsService } from './events.service';
+import { Hash } from './hash.service';
+
+describe('Hash Service', () => {
+  let events = new RedocEventsService();
+  let hashService;
+
+  beforeEach(() => {
+    hashService = new Hash(new BrowserDomAdapter(), events);
+  });
+
+  afterEach(() => {
+    hashService.unbind();
+  });
+
+  it('should trigger changed event after ReDoc bootstrapped', (done) => {
+    spyOn(hashService.changed, 'next').and.callThrough();
+    events.bootstrapped.next();
+    setTimeout(() => {
+      expect(hashService.changed.next).toHaveBeenCalled();
+      done();
+    });
+  });
+});
diff --git a/lib/services/menu.service.js b/lib/services/menu.service.js
index d3f1cce5..175efd61 100644
--- a/lib/services/menu.service.js
+++ b/lib/services/menu.service.js
@@ -31,7 +31,9 @@ export class MenuService {
 
     this.changeActive(CHANGE.INITIAL);
 
-    this.hash.changed.subscribe(this.hashScroll.bind(this));
+    this.hash.changed.subscribe((hash) => {
+      this.hashScroll(hash);
+    });
   }
 
   scrollUpdate(isScrolledDown) {
diff --git a/lib/services/menu.service.spec.js b/lib/services/menu.service.spec.js
new file mode 100644
index 00000000..62c70384
--- /dev/null
+++ b/lib/services/menu.service.spec.js
@@ -0,0 +1,126 @@
+'use strict';
+import { provide, Component } from '@angular/core';
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import {
+  inject,
+  beforeEach,
+  describe,
+  beforeEachProviders,
+  it
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
+
+import { OptionsService } from './options.service';
+import { MenuService } from './menu.service';
+import { Hash } from './hash.service';
+import { ScrollService } from './scroll.service';
+import { RedocEventsService } from './events.service';
+import { MethodsList } from 'lib/components/index';
+import SchemaManager from 'lib/utils/SchemaManager';
+
+describe('Menu service', () => {
+  let menu, hashService, scroll;
+  let builder;
+  let schemaMgr;
+
+  beforeEachProviders(() => [
+      provide(BrowserDomAdapter, {useClass: BrowserDomAdapter}),
+      provide(OptionsService, {useClass: OptionsService}),
+      provide(Hash, {useClass: Hash}),
+      provide(ScrollService, {useClass: ScrollService}),
+      provide(RedocEventsService, {useClass: RedocEventsService}),
+      provide(SchemaManager, {useClass: SchemaManager})
+  ]);
+
+  beforeEach(inject([Hash, ScrollService, SchemaManager, TestComponentBuilder],
+    (_hash, _scroll, _schemaMgr, tcb) => {
+    hashService = _hash;
+    scroll = _scroll;
+    schemaMgr = _schemaMgr;
+    builder = tcb;
+  }));
+
+
+  beforeEach((done) => {
+    schemaMgr.load('/tests/schemas/extended-petstore.yml').then(() => {
+      menu = new MenuService(hashService, scroll, schemaMgr);
+      done();
+    }).catch((err) => done.fail(err));
+  });
+
+  beforeEach((done) => {
+    builder.createAsync(TestApp).then((fixture) => {
+      fixture.detectChanges();
+      done();
+    }).catch((err) => done.fail(err));
+  });
+
+
+  it('should run hashScroll when hash changed', (done) => {
+    spyOn(menu, 'hashScroll').and.callThrough();
+    hashService.changed.subscribe(() => {
+      expect(menu.hashScroll).toHaveBeenCalled();
+      menu.hashScroll.and.callThrough();
+      done();
+    });
+    hashService.changed.next();
+  });
+
+  it('should scroll to method when location hash is present [jp]', (done) => {
+    let hash = '#tag/pet/paths/~1pet~1findByStatus/get';
+    spyOn(menu, 'hashScroll').and.callThrough();
+    spyOn(window, 'scrollTo').and.stub();
+    hashService.changed.subscribe(() => {
+      expect(menu.hashScroll).toHaveBeenCalled();
+      let scrollY = window.scrollTo.calls.argsFor(0)[1];
+      expect(scrollY).toBeGreaterThan(0);
+      window.scrollTo.and.callThrough();
+      done();
+    });
+    hashService.changed.next(hash);
+  });
+
+  it('should scroll to method when location hash is present [operation]', (done) => {
+    let hash = '#operation/getPetById';
+    spyOn(menu, 'hashScroll').and.callThrough();
+    spyOn(window, 'scrollTo').and.stub();
+    hashService.changed.subscribe(() => {
+      expect(menu.hashScroll).toHaveBeenCalled();
+      let scrollY = window.scrollTo.calls.argsFor(0)[1];
+      expect(scrollY).toBeGreaterThan(0);
+      done();
+    });
+    hashService.changed.next(hash);
+  });
+
+  it('should select next/prev menu item when scrolled down/up', () => {
+    scroll.$scrollParent = document.querySelector('#parent');
+    menu.activeCatIdx.should.be.equal(0);
+    menu.activeMethodIdx.should.be.equal(-1);
+    let elTop = menu.getCurrentMethodEl().getBoundingClientRect().bottom;
+
+    scroll.$scrollParent.scrollTop = elTop + 1;
+
+    //simulate scroll down
+    spyOn(scroll, 'scrollY').and.returnValue(elTop + 2);
+    menu.scrollUpdate(true);
+    menu.activeCatIdx.should.be.equal(1);
+
+    scroll.scrollY.and.returnValue(elTop - 2);
+    scroll.$scrollParent.scrollTop = elTop - 1;
+    menu.scrollUpdate(false);
+    menu.activeCatIdx.should.be.equal(0);
+  });
+});
+
+@Component({
+  selector: 'test-app',
+  directives: [ MethodsList ],
+  template:
+      `<div id='parent' style='height: 500px; overflow:auto'>
+        <methods-list></methods-list>
+      </div>`
+})
+class TestApp {
+}
diff --git a/lib/services/options.service.spec.js b/lib/services/options.service.spec.js
new file mode 100644
index 00000000..da53645a
--- /dev/null
+++ b/lib/services/options.service.spec.js
@@ -0,0 +1,55 @@
+'use strict';
+
+import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
+import {
+  it
+} from '@angular/core/testing';
+
+import { OptionsService } from './options.service';
+
+describe('Options Service', () => {
+  let tmpDiv;
+  let optionsService;
+
+  function build(html) {
+    tmpDiv = document.createElement('div');
+    tmpDiv.innerHTML = html;
+    document.body.appendChild(tmpDiv);
+    return tmpDiv.lastChild;
+  }
+
+  afterEach(() => {
+    document.body.removeChild(tmpDiv);
+  });
+
+  beforeEach(() => {
+    optionsService = new OptionsService(new BrowserDomAdapter());
+  });
+
+  it('should parse numeric scrollYOffset', () => {
+    var elem = build(`<redoc scroll-y-offset="50"></redoc>`);
+    optionsService.parseOptions(elem);
+    optionsService.options.scrollYOffset().should.be.equal(50);
+  });
+
+  it('should parse selector scrollYOffset', () => {
+    var elem = build(`<div id="test" style="position: fixed; height: 50px; top:0"> </div>
+          <redoc scroll-y-offset="#test"></redoc>`);
+    optionsService.parseOptions(elem);
+    optionsService.options.scrollYOffset().should.be.equal(50);
+  });
+
+  it('should return 0 for incorrect selector scrollYOffset', () => {
+    var elem = build(`<div id="test" style="position: fixed; height: 50px; top:0"> </div>
+          <redoc scroll-y-offset="#test2"></redoc>`);
+    optionsService.parseOptions(elem);
+    optionsService.options.scrollYOffset().should.be.equal(0);
+  });
+
+  it('should handle function scrollYOffset', () => {
+    optionsService.options = { scrollYOffset: () => 123 };
+    var elem = build(`<redoc></redoc>`);
+    optionsService.parseOptions(elem);
+    optionsService.options.scrollYOffset().should.be.equal(123);
+  });
+});
diff --git a/lib/shared/components/StickySidebar/sticky-sidebar.spec.js b/lib/shared/components/StickySidebar/sticky-sidebar.spec.js
index 50185457..5cebe3ff 100644
--- a/lib/shared/components/StickySidebar/sticky-sidebar.spec.js
+++ b/lib/shared/components/StickySidebar/sticky-sidebar.spec.js
@@ -5,12 +5,13 @@ import { Component, provide } from '@angular/core';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 
 import {
-  TestComponentBuilder,
   inject,
   beforeEach,
   beforeEachProviders,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import { StickySidebar } from 'lib/shared/components/index';
 
diff --git a/lib/shared/components/Tabs/tabs.spec.js b/lib/shared/components/Tabs/tabs.spec.js
index 86915b21..7b3e55ea 100644
--- a/lib/shared/components/Tabs/tabs.spec.js
+++ b/lib/shared/components/Tabs/tabs.spec.js
@@ -4,11 +4,12 @@ import { getChildDebugElement, getChildDebugElementAll } from 'tests/helpers';
 import {Component} from '@angular/core';
 
 import {
-  TestComponentBuilder,
   inject,
   beforeEach,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
+
+import { TestComponentBuilder } from '@angular/compiler/testing';
 
 import {Tabs, Tab} from 'lib/shared/components/index';
 
diff --git a/lib/shared/components/Zippy/zippy.spec.js b/lib/shared/components/Zippy/zippy.spec.js
index d461a80f..b3c41dd4 100644
--- a/lib/shared/components/Zippy/zippy.spec.js
+++ b/lib/shared/components/Zippy/zippy.spec.js
@@ -4,12 +4,12 @@ import { getChildDebugElement, mouseclick } from 'tests/helpers';
 
 import { Component } from '@angular/core';
 import {
-  TestComponentBuilder,
   inject,
   beforeEach,
   it
-} from '@angular/testing';
+} from '@angular/core/testing';
 
+import { TestComponentBuilder } from '@angular/compiler/testing';
 import { Zippy } from 'lib/shared/components/index';
 
 describe('Common components', () => {
diff --git a/tests/setup.js b/tests/setup.js
index d008172c..78f72f56 100644
--- a/tests/setup.js
+++ b/tests/setup.js
@@ -1,13 +1,11 @@
 'use strict';
 
-import {setBaseTestProviders} from 'angular2/testing';
+import {setBaseTestProviders} from '@angular/core/testing';
 
 import {
-  TEST_BROWSER_PLATFORM_PROVIDERS,
-  TEST_BROWSER_APPLICATION_PROVIDERS
-} from 'angular2/platform/testing/browser';
-import {
+  TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
+  TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS
+} from '@angular/platform-browser-dynamic/testing';
 
-  ELEMENT_PROBE_PROVIDERS_PROD_MODE
-} from 'angular2/platform/browser';
-setBaseTestProviders(TEST_BROWSER_PLATFORM_PROVIDERS, [TEST_BROWSER_APPLICATION_PROVIDERS, ELEMENT_PROBE_PROVIDERS_PROD_MODE]);
+
+setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, [TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS]);

From 1134b84f12a4fc37e448a97d055edd3fd96eea98 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Mon, 9 May 2016 23:01:20 +0300
Subject: [PATCH 07/14] Fixed deps

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index df404abb..6fd89df8 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
       "@angular/core": "npm:@angular/core@^2.0.0-rc.1",
       "@angular/platform-browser": "npm:@angular/platform-browser@^2.0.0-rc.1",
       "@angular/platform-browser-dynamic": "npm:@angular/platform-browser-dynamic@^2.0.0-rc.1",
-      "@angular/platform-browser-dynamic-dynamic": "npm:@angular/platform-browser-dynamic-dynamic@^2.0.0-rc.1",
       "Robdel12/DropKick": "github:Robdel12/DropKick@^2.1.7",
       "es6-shim": "github:es-shims/es6-shim@^0.33.6",
       "hint.css": "npm:hint.css@^2.2.1",

From bd4a0d136c4161341bdc16190bbbfa2afc4a2c7a Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 09:43:05 +0300
Subject: [PATCH 08/14] Sauce IE fix

---
 protractor.conf.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index e4fdcfd8..a8f30179 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -14,7 +14,8 @@ let config = {
     return loadJson('https://apis-guru.github.io/api-models/api/v1/list.json').then((list) => {
       global.apisGuruList = list;
       return browser.getCapabilities().then(function (cap) {
-        browser.isIE = cap.browserName === 'internet explorer';
+        browser.isIE = cap.browserName === 'internet explorer'
+          || (cap.caps_ && cap.caps_.browserName === 'internet explorer')
       });
     });
   },

From a1a173950845ffc2628f6b9343aecb01334b42ed Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 09:44:26 +0300
Subject: [PATCH 09/14] Fixed resolving additional properties inside of array

---
 lib/components/JsonSchema/json-schema.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index 26b8277f..a4deef6c 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -109,7 +109,7 @@ export class JsonSchema extends BaseComponent {
     props = props || [];
 
     if (schema.additionalProperties && schema.additionalProperties !== false) {
-      let propsSchema = this.prepareAdditionalProperties(schema.additionalProperties);
+      let propsSchema = this.prepareAdditionalProperties(schema);
       propsSchema._additional = true;
       props.push(propsSchema);
     }
@@ -126,8 +126,9 @@ export class JsonSchema extends BaseComponent {
   }
 
   prepareAdditionalProperties(schema) {
-    return JsonSchema.injectPropertyData(schema, '<Additional Properties> *',
-      JsonPointer.join(schema._pointer || this.pointer, ['additionalProperties']));
+    var addProps = schema.additionalProperties;
+    return JsonSchema.injectPropertyData(addProps, '<Additional Properties> *',
+      JsonPointer.join(addProps._pointer || schema._pointer || this.pointer, ['additionalProperties']));
   }
 
   static injectPropertyData(propertySchema, propertyName, propPointer) {

From 50a378f3ea185b9a712523429a0c347d6705ff81 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 09:44:44 +0300
Subject: [PATCH 10/14] Fix changeDetection in Safari

---
 lib/components/SideMenu/side-menu.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/components/SideMenu/side-menu.js b/lib/components/SideMenu/side-menu.js
index 098c2cf4..5f6de191 100644
--- a/lib/components/SideMenu/side-menu.js
+++ b/lib/components/SideMenu/side-menu.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { ElementRef } from '@angular/core';
+import { ElementRef, ChangeDetectorRef } from '@angular/core';
 import { BrowserDomAdapter } from '@angular/platform-browser/src/browser/browser_adapter';
 import { global } from '@angular/core/src/facade/lang';
 
@@ -13,10 +13,11 @@ import { ScrollService, Hash, MenuService, OptionsService } from '../../services
   providers: [ScrollService, MenuService, Hash],
   styleUrls: ['./lib/components/SideMenu/side-menu.css']
 })
-@Reflect.metadata('parameters', [[SchemaManager], [ElementRef],
-  [BrowserDomAdapter], [ScrollService], [MenuService], [Hash], [OptionsService]])
+@Reflect.metadata('parameters', [[SchemaManager], [ElementRef], [BrowserDomAdapter],
+  [ScrollService], [MenuService], [Hash], [OptionsService], [ChangeDetectorRef]])
 export class SideMenu extends BaseComponent {
-  constructor(schemaMgr, elementRef, dom, scrollService, menuService, hash, optionsService) {
+  constructor(schemaMgr, elementRef, dom, scrollService,
+    menuService, hash, optionsService, detectorRef) {
     super(schemaMgr);
     this.$element = elementRef.nativeElement;
     this.dom = dom;
@@ -28,13 +29,17 @@ export class SideMenu extends BaseComponent {
     this.activeItemCaption = '';
 
     this.options = optionsService.options;
+    this.detectorRef = detectorRef;
 
-    this.menuService.changed.subscribe(this.changed.bind(this));
+    this.menuService.changed.subscribe((cat, item) => this.changed(cat, item));
   }
 
   changed(cat, item) {
     this.activeCatCaption = cat.name || '';
     this.activeItemCaption = item && item.summary || '';
+
+    //safari doesn't update bindings if not run changeDetector manually :(
+    this.detectorRef.detectChanges();
   }
 
   activateAndScroll(idx, methodIdx) {

From b2db144c6bc37fa16185ebe65f2b8435f1cdfef7 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 10:03:04 +0300
Subject: [PATCH 11/14] separate general e2e test from apis.guru

---
 .travis.yml             |  9 ++++---
 build/run_tests.sh      |  2 +-
 tests/e2e/redoc.spec.js | 54 +++++++++++++++++++++--------------------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 208306e8..44f98c58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,10 @@ branches:
 matrix:
   include:
     - env: JOB=e2e
+    - env: JOB=e2e-guru
   fast_finish: true
   allow_failures:
-    - env: JOB=e2e
+    - env: JOB=e2e-guru
 env:
   global:
   - GH_REF: github.com/Rebilly/ReDoc.git
@@ -41,16 +42,16 @@ deploy:
       secure: PuhWLERrCEFmXmdFpw2OVFlqpOIVDmgwk5JUJOYaFdVCh/smp0+jZCQ4vrdFpuG96rnDVirD+A8xvW6NgsNNaRthLgOB/LRdFN69rU6Gvn3At6wlnC55t5dlhxPvCfnzJcHVBLXX4EmMkjnZqDg2uczXTzPodr3FnQJNuXmP8B33fzDVLyHccvXZ90abwXWVrgRIXPU28niqCR8DOC2OTzs7wqz+BLNkYDRRbyYXsg62HWuD33x5iof5IqBmhzBt3usCGmF3QGcgHrXHdZw3sZnit8+Bua++3KrXR0x6HGXXN1AoXVmCAkCa5OTQ5R3tCRxiJN3P2KLnvWeZR74sTFkovJB/6pGCvbJ/c7Wnuw6sD7SgOUBD359ULB6lAf5OnxBLoNebX4JxxVXF+zA4E3Bl44VxkzDpPWc15xqBPMB5vBREzMVmJ5mExn2s5cmLQjADbl9h0y6gZnhnNJ+iTmqtrVyM0ZkF2rPrzrTdGD+ULmRIlTMkdD1bh+/TJ3RdXT3P4/zNUJmiNnvgnnJVYYvsGaXWF+7uCVHT/8k2RsoSHqgkqh0gkDqGSwVix55y5mC7T2Vk9lMBhm6MvFJXaonOX0kxJS4EDQ3plPd6/ybG+TLhwggYnQ8o9msU5Nt6FpUShKiezjKurIhbQZdwlVivX3tahjW2QjNDO58xGgY=
     on:
       tags: true
-      condition: $JOB != e2e
+      condition: $JOB == e2e
   - skip_cleanup: true
     provider: script
     script: npm run branch-release
     on:
       branch: master
-      condition: $JOB != e2e
+      condition: $JOB == e2e
   - skip_cleanup: true
     provider: script
     script: npm run deploy
     on:
       tags: true
-      condition: $JOB != e2e
+      condition: $JOB == e2e
diff --git a/build/run_tests.sh b/build/run_tests.sh
index 308641bf..60ff52f8 100755
--- a/build/run_tests.sh
+++ b/build/run_tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-if [ "$JOB" = "e2e" ]; then
+if [ "$JOB" = "e2e" ] || [ "$JOB" = "e2e-guru" ]; then
   npm run e2e
 else
   npm run unit
diff --git a/tests/e2e/redoc.spec.js b/tests/e2e/redoc.spec.js
index bc1fd6be..ace018ca 100644
--- a/tests/e2e/redoc.spec.js
+++ b/tests/e2e/redoc.spec.js
@@ -51,34 +51,36 @@ describe('Scroll sync', () => {
   });
 });
 
-describe('APIs.guru specs test', ()=> {
+if (process.env.JOB === 'e2e-guru') {
+  describe('APIs.guru specs test', ()=> {
 
-  // global.apisGuruList was loaded in onPrepare method of protractor config
-  let apisGuruList = global.apisGuruList;
+    // global.apisGuruList was loaded in onPrepare method of protractor config
+    let apisGuruList = global.apisGuruList;
 
-  // Remove certain APIs that are known to cause problems
-  delete apisGuruList['motaword.com']; // invalid (see https://github.com/BigstickCarpet/swagger-parser/issues/26)
-  delete apisGuruList['learnifier.com']; // allof object and no type
-  delete apisGuruList['googleapis.com:mirror']; // bad urls in images
-  delete apisGuruList['googleapis.com:discovery']; // non-string references
-  delete apisGuruList['clarify.io']; // non-string references
-  delete apisGuruList['pushpay.com']; // https://github.com/Rebilly/ReDoc/issues/30
+    // Remove certain APIs that are known to cause problems
+    delete apisGuruList['motaword.com']; // invalid (see https://github.com/BigstickCarpet/swagger-parser/issues/26)
+    delete apisGuruList['learnifier.com']; // allof object and no type
+    delete apisGuruList['googleapis.com:mirror']; // bad urls in images
+    delete apisGuruList['googleapis.com:discovery']; // non-string references
+    delete apisGuruList['clarify.io']; // non-string references
+    delete apisGuruList['pushpay.com']; // https://github.com/Rebilly/ReDoc/issues/30
 
-  // run quick version of e2e test on all builds except releases
-  if (process.env.TRAVIS && !process.env.TRAVIS_TAG) {
-    console.log('Running on short APIs guru list');
-    apisGuruList = eachNth(apisGuruList, 10);
-  } else {
-    console.log('Running on full APIs guru list')
-  }
+    // run quick version of e2e test on all builds except releases
+    if (process.env.TRAVIS && !process.env.TRAVIS_TAG) {
+      console.log('Running on short APIs guru list');
+      apisGuruList = eachNth(apisGuruList, 10);
+    } else {
+      console.log('Running on full APIs guru list')
+    }
 
-  for (let apiName of Object.keys(apisGuruList)) {
-    let apiInfo = apisGuruList[apiName].versions[apisGuruList[apiName].preferred];
-    let url = apiInfo.swaggerUrl;
+    for (let apiName of Object.keys(apisGuruList)) {
+      let apiInfo = apisGuruList[apiName].versions[apisGuruList[apiName].preferred];
+      let url = apiInfo.swaggerUrl;
 
-    // temporary hack due to this issue: https://github.com/substack/https-browserify/issues/6
-    url = url.replace('https://', 'http://');
-    url = url.replace('apis-guru.github.io/', 'apis-guru.github.io:80/');
-    basicTests(url, `${apiName}:${apiInfo.info.version}\n${url}`);
-  }
-});
+      // temporary hack due to this issue: https://github.com/substack/https-browserify/issues/6
+      url = url.replace('https://', 'http://');
+      url = url.replace('apis-guru.github.io/', 'apis-guru.github.io:80/');
+      basicTests(url, `${apiName}:${apiInfo.info.version}\n${url}`);
+    }
+  });
+}

From c228c5473c43919eed047ded3809b5f31f1d8f55 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 10:15:16 +0300
Subject: [PATCH 12/14] remove whitespace between root path and method path
 (fixes #44)

---
 lib/components/Method/method.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/Method/method.html b/lib/components/Method/method.html
index 3cd33f02..1fdb449f 100644
--- a/lib/components/Method/method.html
+++ b/lib/components/Method/method.html
@@ -16,7 +16,7 @@
     <h5>Definition</h5>
     <span class="method-endpoint">
         <h5 class="http-method" [ngClass]="data.httpMethod">{{data.httpMethod}}</h5>
-        <span class="api-url">{{data.apiUrl}}</span> <span class="path">{{data.path}}</span>
+        <span class="api-url">{{data.apiUrl}}</span><span class="path">{{data.path}}</span>
     </span>
     <div *ngIf="data.bodyParam">
         <br>

From cc422559fe2d6d65d459c15037892ed52420ca76 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 11:02:47 +0300
Subject: [PATCH 13/14] include basic e2e to the tescases needed for deployment

---
 .travis.yml        | 7 +++----
 build/run_tests.sh | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44f98c58..31d1a1e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ branches:
   - releases
 matrix:
   include:
-    - env: JOB=e2e
     - env: JOB=e2e-guru
   fast_finish: true
   allow_failures:
@@ -42,16 +41,16 @@ deploy:
       secure: PuhWLERrCEFmXmdFpw2OVFlqpOIVDmgwk5JUJOYaFdVCh/smp0+jZCQ4vrdFpuG96rnDVirD+A8xvW6NgsNNaRthLgOB/LRdFN69rU6Gvn3At6wlnC55t5dlhxPvCfnzJcHVBLXX4EmMkjnZqDg2uczXTzPodr3FnQJNuXmP8B33fzDVLyHccvXZ90abwXWVrgRIXPU28niqCR8DOC2OTzs7wqz+BLNkYDRRbyYXsg62HWuD33x5iof5IqBmhzBt3usCGmF3QGcgHrXHdZw3sZnit8+Bua++3KrXR0x6HGXXN1AoXVmCAkCa5OTQ5R3tCRxiJN3P2KLnvWeZR74sTFkovJB/6pGCvbJ/c7Wnuw6sD7SgOUBD359ULB6lAf5OnxBLoNebX4JxxVXF+zA4E3Bl44VxkzDpPWc15xqBPMB5vBREzMVmJ5mExn2s5cmLQjADbl9h0y6gZnhnNJ+iTmqtrVyM0ZkF2rPrzrTdGD+ULmRIlTMkdD1bh+/TJ3RdXT3P4/zNUJmiNnvgnnJVYYvsGaXWF+7uCVHT/8k2RsoSHqgkqh0gkDqGSwVix55y5mC7T2Vk9lMBhm6MvFJXaonOX0kxJS4EDQ3plPd6/ybG+TLhwggYnQ8o9msU5Nt6FpUShKiezjKurIhbQZdwlVivX3tahjW2QjNDO58xGgY=
     on:
       tags: true
-      condition: $JOB == e2e
+      condition: $JOB != e2e-guru
   - skip_cleanup: true
     provider: script
     script: npm run branch-release
     on:
       branch: master
-      condition: $JOB == e2e
+      condition: $JOB != e2e-guru
   - skip_cleanup: true
     provider: script
     script: npm run deploy
     on:
       tags: true
-      condition: $JOB == e2e
+      condition: $JOB != e2e-guru
diff --git a/build/run_tests.sh b/build/run_tests.sh
index 60ff52f8..6d05f49d 100755
--- a/build/run_tests.sh
+++ b/build/run_tests.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
-if [ "$JOB" = "e2e" ] || [ "$JOB" = "e2e-guru" ]; then
+if [ "$JOB" = "e2e-guru" ]; then
   npm run e2e
 else
   npm run unit
+  echo "Starting Basic E2E"
+  npm run e2e
 fi

From fb61b49ec91be7cf7ee0f83b0ab174f2cc74421b Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 11:29:55 +0300
Subject: [PATCH 14/14] bump verstion v0.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6fd89df8..718acfda 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "redoc",
   "description": "Swagger-generated API Reference Documentation",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/Rebilly/ReDoc"