Skip to content

Commit

Permalink
Merge pull request #12 from edcarroll/develop
Browse files Browse the repository at this point in the history
v0.3.2 into Master
  • Loading branch information
edcarroll authored Sep 1, 2016
2 parents ee3953b + 201aa77 commit ef5861b
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 11 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';
export class AppModule {}
```

N.B. you can import individual component modules:
```ts
import {SuiCheckboxModule, SuiRatingModule} from 'ng2-semantic-ui/ng2-semantic-ui';
```

Now you're good to go!

## Dependencies
Expand All @@ -56,7 +61,7 @@ The current list of available components with links to their docs is below:
* [Rating](http://edcarroll.github.io/ng2-semantic-ui/#/components/rating)
* [Search](http://edcarroll.github.io/ng2-semantic-ui/#/components/search)
* [Select](http://edcarroll.github.io/ng2-semantic-ui/#/components/select)
* [Tab](http://edcarroll.github.io/ng2-semantic-ui/#/components/tab)
* [Tabs](http://edcarroll.github.io/ng2-semantic-ui/#/components/tabs)

## Development

Expand Down
14 changes: 13 additions & 1 deletion components/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {NgModule} from "@angular/core";

import {SuiCollapseModule} from "./collapse/collapse.module";
import {SuiAccordionModule} from "./accordion/accordion.module";
import {SuiCheckboxModule} from "./checkbox/checkbox.module";
import {SuiCollapseModule} from "./collapse/collapse.module";
import {SuiDimmerModule} from "./dimmer/dimmer.module";
import {SuiDropdownModule} from "./dropdown/dropdown.module";
import {SuiMessageModule} from "./message/message.module";
Expand All @@ -28,3 +28,15 @@ import {SuiSelectModule} from "./select/select.module";
]
})
export class SuiModule {}

export {SuiAccordionModule};
export {SuiCheckboxModule};
export {SuiCollapseModule};
export {SuiDimmerModule};
export {SuiDropdownModule};
export {SuiMessageModule};
export {SuiProgressModule};
export {SuiRatingModule};
export {SuiSearchModule};
export {SuiTabsModule};
export {SuiSelectModule};
3 changes: 1 addition & 2 deletions components/select/select.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {Subscription} from "rxjs";
@Component({
selector: 'sui-select',
exportAs: 'suiSelect',
directives: [SuiSelectMultiLabel],
inputs: ['placeholder', 'options', 'optionsField', 'isSearchable', 'searchDelay', 'isDisabled', 'allowMultiple', 'maxSelected', 'optionTemplate'],
outputs: ['selectedOptionChange'],
host: {
Expand Down Expand Up @@ -315,4 +314,4 @@ export class SuiSelectValueAccessor extends SuiSearchValueAccessor implements Co
}
}

export const SUI_SELECT_DIRECTIVES = [SuiSelect, SuiSelectOption, SuiSelectValueAccessor];
export const SUI_SELECT_DIRECTIVES = [SuiSelect, SuiSelectOption, SuiSelectValueAccessor, SuiSelectMultiLabel];
4 changes: 2 additions & 2 deletions demo/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import {CodeblockComponent} from './components/codeblock/codeblock.component';
BrowserModule,
CommonModule,
FormsModule,
routing,
SuiModule
SuiModule,
routing
],
providers: [],
entryComponents: [AppComponent],
Expand Down
4 changes: 4 additions & 0 deletions demo/app/pages/getting-started/getting-started.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ <h2 class="ui dividing header">Installation</h2>
<div class="ui segment">
<demo-codeblock language="typescript" [src]="moduleImportCode"></demo-codeblock>
</div>
<p>N.B. you can import individual component modules:</p>
<div class="ui segment">
<demo-codeblock language="typescript" [src]="individualImportCode"></demo-codeblock>
</div>
<p>Now you're good to go!</p>
<h2 class="ui dividing header">Dependencies</h2>
<div class="ui bulleted list">
Expand Down
3 changes: 2 additions & 1 deletion demo/app/pages/getting-started/getting-started.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ import {SuiModule} from 'ng2-semantic-ui/ng2-semantic-ui';
bootstrap: [AppComponent]
})
export class AppModule {}
`
`;
public individualImportCode:string = `import {SuiCheckboxModule, SuiRatingModule} from 'ng2-semantic-ui/ng2-semantic-ui';`;
}
1 change: 1 addition & 0 deletions demo/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ declare var __karma__: any;
__karma__.loaded = function () {};


//noinspection TypeScriptUnresolvedVariable,TypeScriptUnresolvedFunction
Promise.all([
System.import('@angular/core/testing'),
System.import('@angular/platform-browser-dynamic/testing')
Expand Down
4 changes: 1 addition & 3 deletions ng2-semantic-ui.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
import {SuiModule} from './components';

export {SuiModule} from './components';
export * from './components';
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng2-semantic-ui",
"version": "0.3.1",
"version": "0.3.2",
"description": "Angular 2 Semantic UI Components",
"repository": {
"type": "git",
Expand Down

0 comments on commit ef5861b

Please sign in to comment.