You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by gt...@apache.org on 2013/11/06 03:21:42 UTC
[09/22] removing BlackBerry eula
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/29d85c0c/assets/client/ripple.css
----------------------------------------------------------------------
diff --git a/assets/client/ripple.css b/assets/client/ripple.css
index 5ce2be9..4e9486d 100644
--- a/assets/client/ripple.css
+++ b/assets/client/ripple.css
@@ -902,68 +902,6 @@ section.left { left: 0; }
}
/* ------------------------------>
- EULA Window */
-
-.eula-window {
- z-index: 10000;
- width: 100%;
- height: 100%;
- position: absolute;
- top: 0;
- text-align:center;
- vertical-align: middle;
- display: none;
-}
-
-.eula-dialog {
- z-index: 10001;
- position: absolute;
- top: 200px;
- padding: 20px 0 20px 130px;
- opacity: 1;
- width: 450px;
- height: auto;
- text-align: center;
- vertical-align: middle;
- margin: 0 auto;
- display: none;
-}
-
- .eula-logo {
- background: url("images/ripplelogo_large.png") no-repeat 10px 10px;
- background-size: 100% 100%;
- position: absolute;
- width: 122px;
- height: 200px;
- top: 0;
- left: 0;
- }
-
- .eula-dialog > button {
- margin: 0 .25em;
- }
-
- .eula-text h2 {
- font-size: 1.25em;
- }
-
- .eula-text p {
- font-size: 1.17em;
- }
-
- .eula-text div {
- font-size: 1em;
- width: 90%;
- margin: 0 auto;
- height: 250px;
- overflow-y: auto;
- background-color: #e1e1e1;
- color: #1e1e1e;
- text-align: left;
- }
-
-
-/* ------------------------------>
First Run Window */
.first-run-window {
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/29d85c0c/assets/client/themes/dark/theme.css
----------------------------------------------------------------------
diff --git a/assets/client/themes/dark/theme.css b/assets/client/themes/dark/theme.css
index 5735fdf..5145f26 100644
--- a/assets/client/themes/dark/theme.css
+++ b/assets/client/themes/dark/theme.css
@@ -515,14 +515,6 @@ input.ui-button { padding: .4em 1em; }
background: #1e1e1e;
}
-.eula-window {
- background-color: rgba(30, 30, 30, 1);
-}
-
-.eula-dialog {
- color: #F0F0F0;
-}
-
.first-run-window {
background-color: rgba(30, 30, 30, 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/29d85c0c/assets/client/themes/light/theme.css
----------------------------------------------------------------------
diff --git a/assets/client/themes/light/theme.css b/assets/client/themes/light/theme.css
index 2307f1f..768a28b 100644
--- a/assets/client/themes/light/theme.css
+++ b/assets/client/themes/light/theme.css
@@ -527,14 +527,6 @@ input.ui-button { padding: .4em 1em; }
color: #212121;
}
-.eula-window {
- background-color: rgba(218, 218, 218, 1);
-}
-
-.eula-dialog {
- color: #212121;
-}
-
.first-run-window {
background-color: rgba(218, 218, 218, 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/29d85c0c/lib/client/ui.js
----------------------------------------------------------------------
diff --git a/lib/client/ui.js b/lib/client/ui.js
index c59ae7f..64994b8 100644
--- a/lib/client/ui.js
+++ b/lib/client/ui.js
@@ -34,7 +34,6 @@ var _self,
"settings-dialog",
"exec-dialog",
"firstRunCheck",
- "eulaCheck",
"devices",
"goodVibrations",
"panelCollapse",
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/29d85c0c/lib/client/ui/plugins/eulaCheck.js
----------------------------------------------------------------------
diff --git a/lib/client/ui/plugins/eulaCheck.js b/lib/client/ui/plugins/eulaCheck.js
deleted file mode 100644
index 0b26ae5..0000000
--- a/lib/client/ui/plugins/eulaCheck.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * 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.
- *
- */
-var bus = ripple('bus');
-
-function _initializeEulaCheck() {
- var width = jQuery(document).width(),
- p = (width / 2) - 277;
-
-
- $(".eula-window").show();
- $(".eula-dialog").show().css({left: p + "px"});
-
- $("#eula-accept").click(function () {
- bus.send("acceptEula", null, function () {
- $(".eula-window").hide();
- $(".eula-dialog").hide();
- });
- });
-
- $("#eula-decline").click(function () {
- bus.send("disable", null, null);
- });
-}
-
-module.exports = {
- initialize: function () {
- //HACK: there has to be a better way!!!
- if ($("#extension-url").val().match(/geelfhphabnejjhdalkjhgipohgpdnoc/)) {
- // do nothing, extension was installed from the Chrome Store
- return;
- }
-
- bus.send("checkEula", null, function (response) {
- console.log("eula response: ", response.eula);
- if (response.eula === false) {
- _initializeEulaCheck();
- }
- });
- }
-};