git commit: AMBARI-7219. Slider View: FE - view appears squished inhibiting operation (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 9ce44c953 -> 8f287ce38
AMBARI-7219. Slider View: FE - view appears squished inhibiting operation
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f287ce3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f287ce3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f287ce3
Branch: refs/heads/trunk
Commit: 8f287ce38d9a692b25119efebb5a95a0c76595f2
Parents: 9ce44c9
Author: Alex Antonenko
Authored: Tue Sep 9 16:20:01 2014 +0300
Committer: Alex Antonenko
Committed: Tue Sep 9 16:25:40 2014 +0300
--
ambari-web/app/assets/licenses/NOTICE.txt | 4 +-
ambari-web/app/styles/application.less | 1 +
ambari-web/app/views/main/views/details.js | 28 ---
.../jquery.iframe-auto-height.plugin.1.9.5.js | 224 ---
4 files changed, 2 insertions(+), 255 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/assets/licenses/NOTICE.txt
--
diff --git a/ambari-web/app/assets/licenses/NOTICE.txt
b/ambari-web/app/assets/licenses/NOTICE.txt
index 82231f0..d535f1f 100644
--- a/ambari-web/app/assets/licenses/NOTICE.txt
+++ b/ambari-web/app/assets/licenses/NOTICE.txt
@@ -10,7 +10,7 @@ This product includes Ember.js (http://emberjs.com -
https://github.com/emberjs/
Copyright (c) 2011, Yehuda Katz, Tom Dale, Charles Jolley and Ember.js
contributors
This product was generated using Brunch
(https://github.com/brunch/brunch/blob/master/LICENSE)
-Copyright (c) 2011, Allan Berger, Jan Monschke, Martin Schürrer, Thomas
Schranz, Nik Graf, Paul Miller
+Copyright (c) 2011, Allan Berger, Jan Monschke, Martin Sch\u00FCrrer, Thomas
Schranz, Nik Graf, Paul Miller
This product includes Twitter Bootstrap 2
(http://twitter.github.com/bootstrap/ - Apache License v2.0.)
@@ -43,5 +43,3 @@ This product includes Spin.js
(http://fgnass.github.com/spin.js/ - MIT license)
Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
This product includes Moment.js (https://github.com/moment/moment/ - MIT
license)
-
-This product includes iframeAutoHeight.js
(http://github.com/house9/jquery-iframe-auto-height - MIT license)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 1a63440..eb33e6d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6859,6 +6859,7 @@ i.icon-asterisks {
}
.views_sizes {
width:100%;
+ min-height:600px;
border: 0;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/views/main/views/details.js
--
diff --git a/ambari-web/app/views/main/views/details.js
b/ambari-web/app/views/main/views/details.js
index 93c80f9..98184ef 100644
--- a/ambari-web/app/views/main/views/details.js
+++ b/ambari-web/app/views/main/views/details.js
@@ -27,34 +27,6 @@ App.MainViewsDetailsView = Em.View.extend({
attributeBindings: ['src','seamless'],
seamless: "seamless",
- interval: null,
-
- /**
- * Drop autoHeight timer
- */
- willDestroyElement: function() {
-var interval = this.get('interval');
-if (interval) {
- clearInterval(interval);
-}
- },
-
- /**
- * For view's iframe do autoHeight with timer
- * Timer is dropped when user navigates away
- */
- didInsertElement: function() {
-var interval,
- self = this,
- timer = function (resizeFunction, iframe) {
-interval = setInterval(function() {
- resizeFunction(iframe);
-}, 100);
-self.set('interval', interval);
-};
-$('iframe').iframeAutoHeight({triggerFunctions: [timer]});
- },
-
src: function() {
return window.location.origin + this.get('controller.content.href');
}.property('controller.content')
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
--
diff --git
a/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
b/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
deleted file mode 100644
index 2c8c2d8..000
--- a/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/*jslint white: true, indent: 2, onevar: false, browser: true, undef: true,
nomen: false, eqeqeq: true, plusplus: false, bitwise: true, regexp: true,
strict: false, newcap: true, immed:
[20/39] git commit: AMBARI-7219. Slider View: FE - view appears squished inhibiting operation (alexantonenko)
AMBARI-7219. Slider View: FE - view appears squished inhibiting operation
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f287ce3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f287ce3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f287ce3
Branch: refs/heads/branch-alerts-dev
Commit: 8f287ce38d9a692b25119efebb5a95a0c76595f2
Parents: 9ce44c9
Author: Alex Antonenko
Authored: Tue Sep 9 16:20:01 2014 +0300
Committer: Alex Antonenko
Committed: Tue Sep 9 16:25:40 2014 +0300
--
ambari-web/app/assets/licenses/NOTICE.txt | 4 +-
ambari-web/app/styles/application.less | 1 +
ambari-web/app/views/main/views/details.js | 28 ---
.../jquery.iframe-auto-height.plugin.1.9.5.js | 224 ---
4 files changed, 2 insertions(+), 255 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/assets/licenses/NOTICE.txt
--
diff --git a/ambari-web/app/assets/licenses/NOTICE.txt
b/ambari-web/app/assets/licenses/NOTICE.txt
index 82231f0..d535f1f 100644
--- a/ambari-web/app/assets/licenses/NOTICE.txt
+++ b/ambari-web/app/assets/licenses/NOTICE.txt
@@ -10,7 +10,7 @@ This product includes Ember.js (http://emberjs.com -
https://github.com/emberjs/
Copyright (c) 2011, Yehuda Katz, Tom Dale, Charles Jolley and Ember.js
contributors
This product was generated using Brunch
(https://github.com/brunch/brunch/blob/master/LICENSE)
-Copyright (c) 2011, Allan Berger, Jan Monschke, Martin Schürrer, Thomas
Schranz, Nik Graf, Paul Miller
+Copyright (c) 2011, Allan Berger, Jan Monschke, Martin Sch\u00FCrrer, Thomas
Schranz, Nik Graf, Paul Miller
This product includes Twitter Bootstrap 2
(http://twitter.github.com/bootstrap/ - Apache License v2.0.)
@@ -43,5 +43,3 @@ This product includes Spin.js
(http://fgnass.github.com/spin.js/ - MIT license)
Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
This product includes Moment.js (https://github.com/moment/moment/ - MIT
license)
-
-This product includes iframeAutoHeight.js
(http://github.com/house9/jquery-iframe-auto-height - MIT license)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 1a63440..eb33e6d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6859,6 +6859,7 @@ i.icon-asterisks {
}
.views_sizes {
width:100%;
+ min-height:600px;
border: 0;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/app/views/main/views/details.js
--
diff --git a/ambari-web/app/views/main/views/details.js
b/ambari-web/app/views/main/views/details.js
index 93c80f9..98184ef 100644
--- a/ambari-web/app/views/main/views/details.js
+++ b/ambari-web/app/views/main/views/details.js
@@ -27,34 +27,6 @@ App.MainViewsDetailsView = Em.View.extend({
attributeBindings: ['src','seamless'],
seamless: "seamless",
- interval: null,
-
- /**
- * Drop autoHeight timer
- */
- willDestroyElement: function() {
-var interval = this.get('interval');
-if (interval) {
- clearInterval(interval);
-}
- },
-
- /**
- * For view's iframe do autoHeight with timer
- * Timer is dropped when user navigates away
- */
- didInsertElement: function() {
-var interval,
- self = this,
- timer = function (resizeFunction, iframe) {
-interval = setInterval(function() {
- resizeFunction(iframe);
-}, 100);
-self.set('interval', interval);
-};
-$('iframe').iframeAutoHeight({triggerFunctions: [timer]});
- },
-
src: function() {
return window.location.origin + this.get('controller.content.href');
}.property('controller.content')
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f287ce3/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
--
diff --git
a/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
b/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
deleted file mode 100644
index 2c8c2d8..000
--- a/ambari-web/vendor/scripts/jquery.iframe-auto-height.plugin.1.9.5.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/*jslint white: true, indent: 2, onevar: false, browser: true, undef: true,
nomen: false, eqeqeq: true, plusplus: false, bitwise: true, regexp: true,
strict: false, newcap: true, immed: true */
-/*global window, console, jQuery, setTimeout */
-
-/*
- Plu
