Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1ada80b

Browse filesBrowse files
xidedixxidedix
authored
Merge pull request coreui#9 from coreui/dev-v2-rc-0
v2.0.0-rc.0
2 parents d96145a + abc09d5 commit 1ada80b
Copy full SHA for 1ada80b

File tree

7 files changed

+228
-141
lines changed
Filter options

7 files changed

+228
-141
lines changed

‎demo/src/App.js

Copy file name to clipboardExpand all lines: demo/src/App.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import './scss/style.css'
1313
// import '../node_modules/@coreui/styles/scss/_dropdown-menu-right.scss';
1414

1515
// Containers
16-
import Full from './containers/Full/Full.js';
16+
import Full from './containers/DefaultLayout/DefaultLayout.js';
1717

1818
// import { renderRoutes } from 'react-router-config';
1919

‎demo/src/containers/Full/Full.js renamed to ‎demo/src/containers/DefaultLayout/DefaultLayout.js

Copy file name to clipboardExpand all lines: demo/src/containers/DefaultLayout/DefaultLayout.js
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from 'react';
22
import { Redirect, Route, Switch } from 'react-router-dom';
3-
import { Container, Nav, NavItem, NavLink, Badge, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
3+
import { Container, Nav, NavItem, NavLink, Badge, DropdownToggle, DropdownMenu } from 'reactstrap';
44

55
import {
66
AppAside,
@@ -27,7 +27,7 @@ import logo from '../../assets/img/brand/logo.svg'
2727
import sygnet from '../../assets/img/brand/sygnet.svg'
2828
import avatar from '../../assets/img/avatars/6.jpg'
2929

30-
class Full extends Component {
30+
class DefaultLayout extends Component {
3131
render() {
3232
return (
3333
<div className="app">
@@ -88,12 +88,13 @@ class Full extends Component {
8888
Aside
8989
</AppAside>
9090
</div>
91-
<AppFooter fixed>
91+
<AppFooter>
9292
<span><a href="https://coreui.io">CoreUI</a> &copy; 2018 creativeLabs.</span>
93-
<span className="ml-auto">Powered by <a href="https://coreui.io/react">CoreUI for React</a></span> </AppFooter>
93+
<span className="ml-auto">Powered by <a href="https://coreui.io/react">CoreUI for React</a></span>
94+
</AppFooter>
9495
</div>
9596
);
9697
}
9798
}
9899

99-
export default Full;
100+
export default DefaultLayout;

‎demo/src/index.js

Copy file name to clipboardExpand all lines: demo/src/index.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import './polyfill'
12
import React from 'react';
23
import ReactDOM from 'react-dom';
34
import App from './App';
45
// import registerServiceWorker from './registerServiceWorker';
5-
import './polyfill'
66

77
ReactDOM.render(<App />, document.querySelector('#demo'))
88
// ReactDOM.render(<App />, document.getElementById('root'));

‎demo/src/polyfill.js

Copy file name to clipboard
+44-24Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,44 @@
1-
// IE11 polyfills
2-
3-
if (!Array.prototype.find) {
4-
Array.prototype.find = function(predicate) {
5-
if (this == null) {
6-
throw new TypeError('Array.prototype.find called on null or undefined');
7-
}
8-
if (typeof predicate !== 'function') {
9-
throw new TypeError('predicate must be a function');
10-
}
11-
const list = Object(this);
12-
const length = list.length >>> 0;
13-
const thisArg = arguments[1];
14-
let value;
15-
16-
for (let i = 0; i < length; i++) {
17-
value = list[i];
18-
if (predicate.call(thisArg, value, i, list)) {
19-
return value;
20-
}
21-
}
22-
return undefined;
23-
};
24-
}
1+
/*
2+
* required polyfills
3+
*/
4+
5+
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
6+
// import 'core-js/es6/symbol'
7+
// import 'core-js/es6/object'
8+
// import 'core-js/es6/function'
9+
// import 'core-js/es6/parse-int'
10+
// import 'core-js/es6/parse-float'
11+
// import 'core-js/es6/number'
12+
// import 'core-js/es6/math'
13+
// import 'core-js/es6/string'
14+
// import 'core-js/es6/date'
15+
import 'core-js/es6/array'
16+
// import 'core-js/es6/regexp'
17+
import 'core-js/es6/map'
18+
// import 'core-js/es6/weak-map'
19+
import 'core-js/es6/set'
20+
import 'core-js/es7/object'
21+
22+
/** IE10 and IE11 requires the following for the Reflect API. */
23+
// import 'core-js/es6/reflect'
24+
25+
/** Evergreen browsers require these. **/
26+
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
27+
// import 'core-js/es7/reflect'
28+
29+
// CustomEvent() constructor functionality in IE9, IE10, IE11
30+
(function () {
31+
32+
if ( typeof window.CustomEvent === "function" ) return false
33+
34+
function CustomEvent ( event, params ) {
35+
params = params || { bubbles: false, cancelable: false, detail: undefined }
36+
var evt = document.createEvent( 'CustomEvent' )
37+
evt.initCustomEvent( event, params.bubbles, params.cancelable, params.detail )
38+
return evt
39+
}
40+
41+
CustomEvent.prototype = window.Event.prototype
42+
43+
window.CustomEvent = CustomEvent
44+
})()

‎demo/src/routes.js

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import Dashboard from './views/Dashboard/Dashboard.js';
2-
import Full from './containers/Full/Full.js';
2+
import Full from './containers/DefaultLayout/DefaultLayout.js';
33

44
// https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
55
const routes = [
66
{ path: '/', exact: true, name: 'Home', component: Full },
77
{ path: '/dashboard', name: 'Dashboard', component: Dashboard },
88
];
99

10-
export default routes;
10+
export default routes;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.