Skip to content

Commit

Permalink
Merging 4.0.0-beta3.1 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dioslaska committed Jan 26, 2018
1 parent fae9741 commit c02cf8a
Show file tree
Hide file tree
Showing 196 changed files with 26,207 additions and 1,648 deletions.
9 changes: 5 additions & 4 deletions .jsbeautifyrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
"html": {
"allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg"],
"space_after_anon_function": true,
"end_with_newline": false
"end_with_newline": true
},
"css": {
"allowed_file_extensions": ["css", "scss", "sass", "less"],
"end_with_newline": false,
"end_with_newline": true,
"space_around_combinator": true
},
"js": {
"allowed_file_extensions": ["js", "jsx", "json", "jshintrc", "jsbeautifyrc"],
"brace_style": "collapse,preserve-inline",
"e4x": true,
"space_after_anon_function": true,
"end_with_newline": false
"end_with_newline": true
}
}
}
6 changes: 2 additions & 4 deletions bundles/mobiscroll.angular.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export * from './mobiscroll.angular';
export { MbscButton as ɵq, MbscCheckbox as ɵr, MbscDropdown as ɵp, MbscForm as ɵj, MbscFormBase as ɵk, MbscFormService as ɵi, MbscFormValueBase as ɵl, MbscInput as ɵn, MbscInputBase as ɵm, MbscProgress as ɵu, MbscRadio as ɵy, MbscRadioGroup as ɵx, MbscRadioGroupBase as ɵw, MbscRadioService as ɵv, MbscSegmented as ɵba, MbscSegmentedGroup as ɵz, MbscSlider as ɵbb, MbscStepper as ɵt, MbscSwitch as ɵs, MbscTextarea as ɵo } from '../src/js/forms.angular';
export { MbscBase as ɵb, MbscControlBase as ɵd, MbscFrameBase as ɵe, MbscInputService as ɵa, MbscScrollerBase as ɵf, MbscValueBase as ɵc } from '../src/js/frameworks/angular';
export { MbscNote as ɵh, MbscPage as ɵg } from '../src/js/page.angular';
export { MbscScroller as ɵbc } from '../src/js/scroller.angular';
export { MbscFormBase as ɵh, MbscFormValueBase as ɵi, MbscInputBase as ɵj, MbscRadioGroupBase as ɵl, MbscRadioService as ɵk } from '../src/js/forms.angular';
export { MbscBase as ɵc, MbscControlBase as ɵe, MbscFrameBase as ɵf, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscScrollerBase as ɵg, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
58 changes: 58 additions & 0 deletions examples/angular/.angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "angular"
},
"apps": [{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../node_modules/mobiscroll-angular/dist/css/mobiscroll.min.css",
"styles.css"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
13 changes: 13 additions & 0 deletions examples/angular/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
42 changes: 42 additions & 0 deletions examples/angular/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db
27 changes: 27 additions & 0 deletions examples/angular/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Angular

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.4.3.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
14 changes: 14 additions & 0 deletions examples/angular/e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AppPage } from './app.po';

describe('angular App', () => {
let page: AppPage;

beforeEach(() => {
page = new AppPage();
});

it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to app!');
});
});
11 changes: 11 additions & 0 deletions examples/angular/e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { browser, by, element } from 'protractor';

export class AppPage {
navigateTo() {
return browser.get('/');
}

getParagraphText() {
return element(by.css('app-root h1')).getText();
}
}
14 changes: 14 additions & 0 deletions examples/angular/e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}
33 changes: 33 additions & 0 deletions examples/angular/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
};
Loading

0 comments on commit c02cf8a

Please sign in to comment.