projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
resources
/
options
/
alert_overlay.js
diff --git
a/src/chrome/browser/resources/options/alert_overlay.js
b/src/chrome/browser/resources/options/alert_overlay.js
index
aab1176
..
cd7aaf3
100644
(file)
--- a/
src/chrome/browser/resources/options/alert_overlay.js
+++ b/
src/chrome/browser/resources/options/alert_overlay.js
@@
-3,22
+3,24
@@
// found in the LICENSE file.
cr.define('options', function() {
// found in the LICENSE file.
cr.define('options', function() {
- var OptionsPage = options.OptionsPage;
+ var Page = cr.ui.pageManager.Page;
+ var PageManager = cr.ui.pageManager.PageManager;
/**
* AlertOverlay class
* Encapsulated handling of a generic alert.
/**
* AlertOverlay class
* Encapsulated handling of a generic alert.
- * @class
+ * @constructor
+ * @extends {cr.ui.pageManager.Page}
*/
function AlertOverlay() {
*/
function AlertOverlay() {
-
Options
Page.call(this, 'alertOverlay', '', 'alertOverlay');
+ Page.call(this, 'alertOverlay', '', 'alertOverlay');
}
cr.addSingletonGetter(AlertOverlay);
AlertOverlay.prototype = {
}
cr.addSingletonGetter(AlertOverlay);
AlertOverlay.prototype = {
- // Inherit AlertOverlay from
Options
Page.
- __proto__:
Options
Page.prototype,
+ // Inherit AlertOverlay from Page.
+ __proto__: Page.prototype,
/**
* Whether the page can be shown. Used to make sure the page is only
/**
* Whether the page can be shown. Used to make sure the page is only
@@
-27,12
+29,12
@@
cr.define('options', function() {
*/
canShow_: false,
*/
canShow_: false,
- /**
- * Initialize the page.
- */
+ /** @override */
initializePage: function() {
initializePage: function() {
- // Call base class implementation to start preference initialization.
- OptionsPage.prototype.initializePage.call(this);
+ Page.prototype.initializePage.call(this);
+
+ // AlertOverlay is special in that it is not tied to one page or overlay.
+ this.alwaysOnTop = true;
var self = this;
$('alertOverlayOk').onclick = function(event) {
var self = this;
$('alertOverlayOk').onclick = function(event) {
@@
-44,21
+46,13
@@
cr.define('options', function() {
};
},
};
},
- /** @override */
- get nestingLevel() {
- // AlertOverlay is special in that it is not tied to one page or overlay.
- // Set the nesting level arbitrarily high so as to always be recognized as
- // the top-most visible page.
- return 99;
- },
-
/**
* Handle the 'ok' button. Clear the overlay and call the ok callback if
* available.
* @private
*/
handleOK_: function() {
/**
* Handle the 'ok' button. Clear the overlay and call the ok callback if
* available.
* @private
*/
handleOK_: function() {
-
OptionsPage
.closeOverlay();
+
PageManager
.closeOverlay();
if (this.okCallback != undefined) {
this.okCallback.call();
}
if (this.okCallback != undefined) {
this.okCallback.call();
}
@@
-70,7
+64,7
@@
cr.define('options', function() {
* @private
*/
handleCancel_: function() {
* @private
*/
handleCancel_: function() {
-
OptionsPage
.closeOverlay();
+
PageManager
.closeOverlay();
if (this.cancelCallback != undefined) {
this.cancelCallback.call();
}
if (this.cancelCallback != undefined) {
this.cancelCallback.call();
}
@@
-78,6
+72,7
@@
cr.define('options', function() {
/**
* The page is getting hidden. Don't let it be shown again.
/**
* The page is getting hidden. Don't let it be shown again.
+ * @override
*/
willHidePage: function() {
canShow_ = false;
*/
willHidePage: function() {
canShow_ = false;
@@
-142,7
+137,7
@@
cr.define('options', function() {
// Intentionally don't show the URL in the location bar as we don't want
// people trying to navigate here by hand.
// Intentionally don't show the URL in the location bar as we don't want
// people trying to navigate here by hand.
-
OptionsPage
.showPageByName('alertOverlay', false);
+
PageManager
.showPageByName('alertOverlay', false);
};
// Export
};
// Export