You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/05 07:31:24 UTC
[09/11] ignite git commit: IGNITE-6873 Notify users about outdated
browser.
IGNITE-6873 Notify users about outdated browser.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff3712ce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff3712ce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff3712ce
Branch: refs/heads/ignite-zk
Commit: ff3712ce830decb09fd68f71e56dd5eee4c51115
Parents: f418563
Author: Ilya Borisov <ib...@gridgain.com>
Authored: Tue Dec 5 14:00:01 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Tue Dec 5 14:00:01 2017 +0700
----------------------------------------------------------------------
.../frontend/app/browserUpdate/index.js | 34 ++++++++++++++++++
.../frontend/app/browserUpdate/style.scss | 36 ++++++++++++++++++++
modules/web-console/frontend/package.json | 5 +--
.../frontend/webpack/webpack.common.js | 3 +-
4 files changed, 75 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff3712ce/modules/web-console/frontend/app/browserUpdate/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/browserUpdate/index.js b/modules/web-console/frontend/app/browserUpdate/index.js
new file mode 100644
index 0000000..85df64e
--- /dev/null
+++ b/modules/web-console/frontend/app/browserUpdate/index.js
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import browserUpdate from 'browser-update';
+import './style.scss';
+
+browserUpdate({
+ notify: {
+ i: 10,
+ f: '-18m',
+ s: 9,
+ c: '-18m',
+ o: '-18m',
+ e: '-6m'
+ },
+ l: 'en',
+ mobile: false,
+ api: 5,
+ reminder: 0
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff3712ce/modules/web-console/frontend/app/browserUpdate/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/browserUpdate/style.scss b/modules/web-console/frontend/app/browserUpdate/style.scss
new file mode 100644
index 0000000..5842f5f
--- /dev/null
+++ b/modules/web-console/frontend/app/browserUpdate/style.scss
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import "./../primitives/btn/index.scss";
+
+#buorg.buorg {
+ background-color: $brand-warning;
+ line-height: 16px;
+ font-family: Roboto, sans-serif;
+
+ a {
+ @extend .btn-ignite;
+
+ &#buorgul {
+ @extend .btn-ignite--success;
+ }
+
+ &#buorgig {
+ @extend .btn-ignite--primary;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff3712ce/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index 18635f7..5b1734f 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -61,6 +61,7 @@
"babel-runtime": "6.25.0",
"bootstrap-sass": "3.3.7",
"brace": "0.10.0",
+ "browser-update": "2.1.9",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.28.7",
"eslint": "4.3.0",
@@ -102,7 +103,6 @@
},
"devDependencies": {
"chai": "4.1.0",
- "type-detect": "4.0.3",
"jasmine-core": "2.6.4",
"karma": "1.7.0",
"karma-babel-preprocessor": "6.0.1",
@@ -115,6 +115,7 @@
"mocha": "3.4.2",
"mocha-teamcity-reporter": "1.1.1",
"phantomjs-prebuilt": "2.1.14",
- "sinon": "2.3.8"
+ "sinon": "2.3.8",
+ "type-detect": "4.0.3"
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ff3712ce/modules/web-console/frontend/webpack/webpack.common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/webpack/webpack.common.js b/modules/web-console/frontend/webpack/webpack.common.js
index 48e1e9b..a0d6d0c 100644
--- a/modules/web-console/frontend/webpack/webpack.common.js
+++ b/modules/web-console/frontend/webpack/webpack.common.js
@@ -44,7 +44,8 @@ export default {
entry: {
polyfill: 'babel-polyfill',
vendor: path.join(app, 'vendor.js'),
- app: path.join(app, 'app.js')
+ app: path.join(app, 'app.js'),
+ browserUpdate: path.join(app, 'browserUpdate', 'index.js')
},
// Output system.