Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2024-11-22 16:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

updated angular2 to the latest beta (beta.12)

Browse Source
This commit is contained in:
Roman Hotsiy 2016-03-27 18:25:46 +03:00
parent 36034d4d1a
commit 4ca1bdb5de
21 changed files with 62 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/tasks/build.js
View File

@ -43,14 +43,14 @@ gulp.task('inlineTemplates', ['sass'], function() {
var JS_DEV_DEPS = [
'lib/utils/browser-update.js',
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/zone.js',
'node_modules/reflect-metadata/Reflect.js',
'node_modules/babel-polyfill/dist/polyfill.js'
];
var JS_DEV_DEPS_MIN = [
'lib/utils/browser-update.js',
'node_modules/zone.js/dist/zone-microtask.min.js',
'node_modules/zone.js/dist/zone.min.js',
'node_modules/reflect-metadata/Reflect.js',
'node_modules/babel-polyfill/dist/polyfill.min.js'
]

4
karma.conf.js
View File

@ -45,9 +45,9 @@ module.exports = function (config) {
},
//load angular dependencies and browser polyfills
files: [
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/babel-polyfill/dist/polyfill.js',
'./node_modules/reflect-metadata/Reflect.js'
],

6
lib/common/components/StickySidebar/sticky-sidebar.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElementByType } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
@ -60,8 +60,8 @@ describe('Common components', () => {
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [StickySidebar],
template:
`<div style="padding-top: 20px">

10
lib/common/components/Tabs/tabs.js
View File

@ -1,13 +1,11 @@
'use strict';
import {Component, View, EventEmitter} from 'angular2/core';
import {Component, EventEmitter} from 'angular2/core';
import {CORE_DIRECTIVES} from 'angular2/common';
@Component({
selector: 'tabs',
events: ['change']
})
@View({
events: ['change'],
template: `
<ul>
<li *ngFor="#tab of tabs" [ngClass]="{active: tab.active}" (click)="selectTab(tab)"
@ -61,9 +59,7 @@ export class Tabs {
@Component({
selector: 'tab',
inputs: ['tabTitle', 'tabStatus']
})
@View({
inputs: ['tabTitle', 'tabStatus'],
template: `
<div class="tab-wrap" [ngClass]="{ 'active': active }">
<ng-content></ng-content>

6
lib/common/components/Tabs/tabs.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement, getChildDebugElementAll } from 'tests/helpers';
import {Component, View} from 'angular2/core';
import {Component} from 'angular2/core';
import {
TestComponentBuilder,
@ -137,8 +137,8 @@ describe('Common components', () => {
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [Tabs, Tab],
template:
`<tabs (change)="onEvent($event)">

6
lib/common/components/Zippy/zippy.js
View File

@ -1,14 +1,12 @@
'use strict';
import {Component, View, EventEmitter} from 'angular2/core';
import {Component, EventEmitter} from 'angular2/core';
import {CORE_DIRECTIVES} from 'angular2/common';
@Component({
selector: 'zippy',
events: ['open', 'close'],
inputs: ['title', 'visible', 'type', 'empty']
})
@View({
inputs: ['title', 'visible', 'type', 'empty'],
templateUrl: './lib/common/components/Zippy/zippy.html',
styleUrls: ['./lib/common/components/Zippy/zippy.css'],
directives: [CORE_DIRECTIVES]

6
lib/common/components/Zippy/zippy.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement, mouseclick } from 'tests/helpers';
import {Component, View} from 'angular2/core';
import {Component} from 'angular2/core';
import {
TestComponentBuilder,
@ -94,8 +94,8 @@ describe('Common components', () => {
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [Zippy],
template:
`<zippy title="Zippy" type="test" visible="true" empty="true" (open)="open()" (close)="close()">test</zippy>`

6
lib/components/ApiInfo/api-info.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import {
TestComponentBuilder,
@ -53,8 +53,8 @@ describe('Redoc components', () => {
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [ApiInfo],
template:
`<api-info></api-info>`

6
lib/components/ApiLogo/api-logo.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import {
TestComponentBuilder,
@ -65,8 +65,8 @@ describe('Redoc components', () => {
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [ApiLogo],
providers: [SchemaManager],
template:

8
lib/components/JsonSchema/json-schema-lazy.js
View File

@ -1,6 +1,6 @@
'use strict';
import {Component, View, ElementRef} from 'angular2/core';
import {Component, ElementRef} from 'angular2/core';
import {CORE_DIRECTIVES} from 'angular2/common';
import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
@ -14,9 +14,7 @@ var cache = {};
@Component({
selector: 'json-schema-lazy',
inputs: ['pointer', 'auto']
})
@View({
inputs: ['pointer', 'auto'],
template: '',
directives: [CORE_DIRECTIVES]
})
@ -41,6 +39,8 @@ export default class JsonSchemaLazy {
if (this.pointer) {
this.dcl.loadNextToLocation(JsonSchema, this.elementRef).then((compRef) => {
compRef.instance.pointer = this.pointer;
// trigger change detection
compRef.location.internalElement.parentView.changeDetector.detectChanges();
});
}
this.loaded = true;

9
lib/components/JsonSchema/json-schema-lazy.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
import {BrowserDomAdapter} from 'angular2/platform/browser';
@ -25,7 +25,8 @@ describe('Redoc components', () => {
let fixture;
let loader;
let appRef = {
instance: {}
instance: {},
location: {internalElement: {parentView: {changeDetector: {detectChanges : function() {} }}}}
};
beforeEachProviders(() => [
provide(SchemaManager, {useValue: schemaMgr}),
@ -80,8 +81,8 @@ describe('Redoc components', () => {
/** Test component that contains a Method. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [JsonSchemaLazy],
template:
`<json-schema-lazy></json-schema-lazy>`

6
lib/components/JsonSchema/json-schema.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import OptionsManager from 'lib/options';
import {
@ -64,8 +64,8 @@ describe('Redoc components', () => {
/** Test component that contains a Method. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [JsonSchema],
providers: [SchemaManager],
template:

6
lib/components/Method/method.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
@ -57,8 +57,8 @@ describe('Redoc components', () => {
/** Test component that contains a Method. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [Method],
providers: [SchemaManager],
template:

6
lib/components/MethodsList/methods-list.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, provide} from 'angular2/core';
import {Component, provide} from 'angular2/core';
import OptionsManager from 'lib/options';
import {BrowserDomAdapter} from 'angular2/platform/browser';
@ -56,8 +56,8 @@ describe('Redoc components', () => {
});
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [MethodsList],
providers: [SchemaManager],
template:

6
lib/components/Redoc/redoc.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement } from 'tests/helpers';
import {Component, View, ViewMetadata, provide} from 'angular2/core';
import {Component, ViewMetadata, provide} from 'angular2/core';
import {BrowserDomAdapter} from 'angular2/platform/browser';
import {
@ -224,8 +224,8 @@ describe('Redoc components', () => {
});
/** Test component that contains a Redoc. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [Redoc],
template:
`<redoc disable-lazy-schemas></redoc>`

6
lib/components/SideMenu/side-menu.spec.js
View File

@ -1,7 +1,7 @@
'use strict';
import { getChildDebugElement, mouseclick} from 'tests/helpers';
import {Component, View, provide, ViewMetadata} from 'angular2/core';
import {Component, provide, ViewMetadata} from 'angular2/core';
import {BrowserDomAdapter} from 'angular2/platform/browser';
import OptionsManager from 'lib/options';
@ -196,8 +196,8 @@ describe('Redoc components', () => {
});
/** Test component that contains an ApiInfo. */
@Component({selector: 'test-app'})
@View({
@Component({
selector: 'test-app',
directives: [MethodsList, SideMenu],
providers: [SchemaManager],
template:

9
lib/components/base.js
View File

@ -1,5 +1,5 @@
'use strict';
import {Component, View, OnInit, OnDestroy, ChangeDetectionStrategy} from 'angular2/core';
import {Component, ChangeDetectionStrategy} from 'angular2/core';
import {CORE_DIRECTIVES, JsonPipe, AsyncPipe} from 'angular2/common';
import SchemaManager from '../utils/SchemaManager';
import JsonPointer from '../utils/JsonPointer';
@ -74,11 +74,8 @@ export function RedocComponent(options) {
selector: options.selector,
inputs: inputs,
outputs: options.outputs,
lifecycle: [OnInit, OnDestroy],
providers: options.providers,
changeDetection: options.changeDetection || ChangeDetectionStrategy.Detached
});
let viewDecorator = View({
changeDetection: options.changeDetection || ChangeDetectionStrategy.Detached,
templateUrl: options.templateUrl,
template: options.template,
styles: options.styles,
@ -86,7 +83,7 @@ export function RedocComponent(options) {
pipes: pipes
});
return componentDecorator(viewDecorator(target) || target) || target;
return componentDecorator(target) || target;
};
}

1
lib/utils/SchemaManager.js
View File

@ -38,6 +38,7 @@ export default class SchemaManager {
/* calculate common used values */
init() {
if (!this._schema || !this._schema.schemes) return;
this.apiUrl = this._schema.schemes[0] + '://' + this._schema.host + this._schema.basePath;
if (this.apiUrl.endsWith('/')) {
this.apiUrl = this.apiUrl.substr(0, this.apiUrl.length - 1);

6
lib/utils/pipes.js
View File

@ -14,19 +14,17 @@ import 'prismjs/components/prism-php.js';
import 'prismjs/components/prism-coffeescript.js';
import 'prismjs/components/prism-go.js';
import 'prismjs/components/prism-haskell.js';
//import 'prismjs/components/prism-scala.js';
import 'prismjs/components/prism-java.js';
import 'prismjs/components/prism-lua.js';
import 'prismjs/components/prism-matlab.js';
import 'prismjs/components/prism-objectivec.js';
import 'prismjs/components/prism-perl.js';
import 'prismjs/components/prism-python.js';
import 'prismjs/components/prism-r.js';
import 'prismjs/components/prism-ruby.js';
import 'prismjs/components/prism-bash.js';
import 'prismjs/components/prism-swift.js';
import 'prismjs/components/prism-vim.js';
import 'prismjs/components/prism-objectivec.js';
import 'prismjs/components/prism-scala.js';
import 'prismjs/themes/prism-dark.css!css';
import marked from 'marked';

4
package.json
View File

@ -32,7 +32,7 @@
"jspm": {
"configFile": "system.config.js",
"dependencies": {
"angular2": "npm:angular2@2.0.0-beta.6",
"angular2": "npm:angular2@^2.0.0-beta.12",
"es6-shim": "github:es-shims/es6-shim@^0.33.6",
"json": "github:systemjs/plugin-json@^0.1.0",
"json-formatter-js": "npm:json-formatter-js@^0.2.0",
@ -96,6 +96,6 @@
"sinon": "^1.17.2",
"systemjs-builder": "^0.15.2",
"vinyl-paths": "^2.0.0",
"zone.js": "^0.5.10"
"zone.js": "^0.6.6"
}
}

27
system.config.js
View File

@ -37,7 +37,7 @@ System.config({
},
map: {
"angular2": "npm:angular2@2.0.0-beta.6",
"angular2": "npm:angular2@2.0.0-beta.12",
"babel": "npm:babel-core@5.8.34",
"babel-runtime": "npm:babel-runtime@5.8.34",
"clean-css": "npm:clean-css@3.4.6",
@ -135,14 +135,10 @@ System.config({
"path": "github:jspm/nodelibs-path@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:angular2@2.0.0-beta.6": {
"crypto": "github:jspm/nodelibs-crypto@0.1.0",
"es6-promise": "npm:es6-promise@3.1.2",
"es6-shim": "npm:es6-shim@0.33.13",
"process": "github:jspm/nodelibs-process@0.1.2",
"reflect-metadata": "npm:reflect-metadata@0.1.2",
"rxjs": "npm:rxjs@5.0.0-beta.0",
"zone.js": "npm:zone.js@0.5.14"
"npm:angular2@2.0.0-beta.12": {
"reflect-metadata": "npm:reflect-metadata@0.1.3",
"rxjs": "npm:rxjs@5.0.0-beta.3",
"zone.js": "npm:zone.js@0.5.15"
},
"npm:argparse@1.0.3": {
"assert": "github:jspm/nodelibs-assert@0.1.0",
@ -419,9 +415,6 @@ System.config({
"npm:es6-promise@3.1.2": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:es6-shim@0.33.13": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:esprima@2.7.1": {
"fs": "github:jspm/nodelibs-fs@0.1.2",
"process": "github:jspm/nodelibs-process@0.1.2"
@ -691,10 +684,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.67.0": {
"aws-sign2": "npm:aws-sign2@0.6.0",
"bl": "npm:bl@1.0.0",
@ -732,7 +721,7 @@ System.config({
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:rxjs@5.0.0-beta.0": {
"npm:rxjs@5.0.0-beta.3": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.2"
},
@ -865,10 +854,6 @@ System.config({
"request": "npm:request@2.67.0",
"systemjs-json": "github:systemjs/plugin-json@0.1.0",
"validator": "npm:validator@4.5.0"
},
"npm:zone.js@0.5.14": {
"es6-promise": "npm:es6-promise@3.1.2",
"process": "github:jspm/nodelibs-process@0.1.2"
}
}
});