Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: chrome/browser/resources/pdf/index.js

Issue 169613005: Hookup print and save buttons in the out of process PDF plugin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/pdf/index.html ('k') | chrome/browser/resources/pdf/index.in.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/pdf/index.js
diff --git a/chrome/browser/resources/pdf/index.js b/chrome/browser/resources/pdf/index.js
index ea0642cdb3d45761881ffacebc1c1faab8ad1766..e52ad1741e27f80ac2fde7cd76261ea9f5f1d1d6 100644
--- a/chrome/browser/resources/pdf/index.js
+++ b/chrome/browser/resources/pdf/index.js
@@ -389,32 +389,49 @@ Polymer={},"function"==typeof window.Polymer&&(Polymer={}),function(a){function
Polymer('viewer-toolbar', {
fadingIn: false,
- timerId: undefined,
+ timerId_: undefined,
+ inInitialFadeIn_: false,
ready: function() {
- this.fadingInChanged();
- },
- fadeIn: function() {
- this.fadingIn = true;
+ this.parentNode.addEventListener('mousemove', function(e) {
+ var rect = this.getBoundingClientRect();
+ if (e.clientX >= rect.left && e.clientX <= rect.right &&
+ e.clientY >= rect.top && e.clientY <= rect.bottom) {
+ this.fadingIn = true;
+ // If we hover over the toolbar, cancel the initial fade in.
+ if (this.inInitialFadeIn_)
+ this.inInitialFadeIn_ = false;
+ } else {
+ // Initially we want to keep the toolbar up for a longer period.
+ if (!this.inInitialFadeIn_)
+ this.fadingIn = false;
+ }
+ }.bind(this));
},
- fadeOut: function() {
- this.fadingIn = false;
+ initialFadeIn: function() {
+ this.inInitialFadeIn_ = true;
+ this.fadeIn();
+ this.fadeOutAfterDelay(6000);
},
fadingInChanged: function() {
if (this.fadingIn) {
- this.style.opacity = 1;
- if (this.timerId !== undefined) {
- clearTimeout(this.timerId);
- this.timerId = undefined;
- }
+ this.fadeIn();
} else {
- if (this.timerId === undefined) {
- this.timerId = setTimeout(
- function() {
- this.style.opacity = 0;
- this.timerId = undefined;
- }.bind(this), 3000);
- }
+ if (this.timerId_ === undefined)
+ this.fadeOutAfterDelay(3000);
}
+ },
+ fadeIn: function() {
+ this.style.opacity = 1;
+ clearTimeout(this.timerId_);
+ this.timerId_ = undefined;
+ },
+ fadeOutAfterDelay: function(delay) {
+ this.timerId_ = setTimeout(
+ function() {
+ this.style.opacity = 0;
+ this.timerId_ = undefined;
+ this.inInitialFadeIn_ = false;
+ }.bind(this), delay);
}
});
;
@@ -454,26 +471,28 @@ Polymer={},"function"==typeof window.Polymer&&(Polymer={}),function(a){function
text: '1',
timerId: undefined,
ready: function() {
- var scrollCallback = function() {
- var percent = window.scrollY /
- (document.body.scrollHeight -
- document.documentElement.clientHeight);
- this.style.top = percent *
- (document.documentElement.clientHeight - this.offsetHeight) + 'px';
- this.style.opacity = 1;
- clearTimeout(this.timerId);
-
- this.timerId = setTimeout(function() {
- this.style.opacity = 0;
- this.timerId = undefined;
- }.bind(this), 2000);
- }.bind(this);
+ var callback = this.fadeIn.bind(this, 2000);
window.addEventListener('scroll', function() {
- requestAnimationFrame(scrollCallback);
+ requestAnimationFrame(callback);
});
-
- scrollCallback();
},
+ initialFadeIn: function() {
+ this.fadeIn(6000);
+ },
+ fadeIn: function(displayTime) {
+ var percent = window.scrollY /
+ (document.body.scrollHeight -
+ document.documentElement.clientHeight);
+ this.style.top = percent *
+ (document.documentElement.clientHeight - this.offsetHeight) + 'px';
+ this.style.opacity = 1;
+ clearTimeout(this.timerId);
+
+ this.timerId = setTimeout(function() {
+ this.style.opacity = 0;
+ this.timerId = undefined;
+ }.bind(this), displayTime);
+ }
});
;
« no previous file with comments | « chrome/browser/resources/pdf/index.html ('k') | chrome/browser/resources/pdf/index.in.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698