You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/02 11:57:19 UTC
[royale-asjs] branch develop updated: refactor "remove-app-scroll"
style to new viewport
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4397654 refactor "remove-app-scroll" style to new viewport
4397654 is described below
commit 4397654712c414cec4a9b4cb971113238e95a229
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 2 13:57:14 2018 +0200
refactor "remove-app-scroll" style to new viewport
---
.../projects/Jewel/src/main/resources/defaults.css | 4 --
.../main/royale/org/apache/royale/jewel/Drawer.as | 4 +-
.../beads/controllers/DateFieldMouseController.as | 50 +++++++++++-----------
.../royale/jewel/beads/views/DateFieldView.as | 10 ++---
.../projects/Jewel/src/main/sass/_global.sass | 4 --
5 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index fc5e59d..fa237c2 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -24,10 +24,6 @@ html, body {
height: 100%;
}
-.remove-app-scroll {
- overflow: hidden;
-}
-
::-moz-focus-inner, ::-moz-focus-outer {
border: 0;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Drawer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Drawer.as
index 2436fa0..4377bd1 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Drawer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Drawer.as
@@ -130,10 +130,10 @@ package org.apache.royale.jewel
//avoid scroll in html
if(fixed)
{
- document.body.classList.remove("remove-app-scroll");
+ document.body.classList.remove("viewport");
} else
{
- document.body.classList.toggle("remove-app-scroll", _isOpen);
+ document.body.classList.toggle("viewport", _isOpen);
}
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateFieldMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateFieldMouseController.as
index 44a75d4..1320fbe 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateFieldMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateFieldMouseController.as
@@ -96,7 +96,7 @@ package org.apache.royale.jewel.beads.controllers
// t.addEventListener("timer", addDismissHandler);
// t.start();
- // viewBead.popUp is DateChooser that fills 100% of browser windew-> We want Table inside
+ // viewBead.popUp is DateChooser that fills 100% of browser window-> We want Table inside
daysTable = (viewBead.popUp.getBeadByType(DateChooserView) as DateChooserView).daysTable;
IEventDispatcher(daysTable).addEventListener(MouseEvent.MOUSE_DOWN, handleControlMouseDown);
@@ -104,7 +104,7 @@ package org.apache.royale.jewel.beads.controllers
}
protected function handleControlMouseDown(event:MouseEvent):void
- {
+ {
event.stopImmediatePropagation();
}
@@ -115,29 +115,7 @@ package org.apache.royale.jewel.beads.controllers
IEventDispatcher(viewBead.popUp).removeEventListener(Event.CHANGE, changeHandler);
viewBead.popUpVisible = false;
}
-
- /**
- * @private
- */
- // private function addDismissHandler(event:Event):void
- // {
- // var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
- // if (host) {
- // host.addEventListener(MouseEvent.CLICK, dismissHandler);
- // }
- // }
-
- /**
- * @private
- */
- // private function removeDismissHandler():void
- // {
- // var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
- // if (host) {
- // host.removeEventListener(MouseEvent.CLICK, dismissHandler);
- // }
- // }
-
+
/**
* @private
*/
@@ -174,6 +152,28 @@ package org.apache.royale.jewel.beads.controllers
}
}
+ /**
+ * @private
+ */
+ // private function addDismissHandler(event:Event):void
+ // {
+ // var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ // if (host) {
+ // host.addEventListener(MouseEvent.CLICK, dismissHandler);
+ // }
+ // }
+
+ /**
+ * @private
+ */
+ // private function removeDismissHandler():void
+ // {
+ // var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ // if (host) {
+ // host.removeEventListener(MouseEvent.CLICK, dismissHandler);
+ // }
+ // }
+
/**
* @private
*/
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
index 1de0a09..6a209a3 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
@@ -242,7 +242,7 @@ package org.apache.royale.jewel.beads.views
UIUtils.removePopUp(_popUp);
COMPILE::JS
{
- document.body.classList.remove("remove-app-scroll");
+ document.body.classList.remove("viewport");
}
_popUp.removeEventListener("initComplete", handlePopUpInitComplete);
_popUp = null;
@@ -251,16 +251,16 @@ package org.apache.royale.jewel.beads.views
_showingPopup = false;
}
- COMPILE::JS
- private var rq:int;
+ // COMPILE::JS
+ // private var rq:int;
private function prepareForPopUp():void
{
- //avoid scroll in html
_popUp.addClass("open");
COMPILE::JS
{
+ //avoid scroll in html
+ document.body.classList.add("viewport");
//cancelAnimationFrame(rq);
- document.body.classList.add("remove-app-scroll");
}
}
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index ed4831d..8b8c959 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -27,10 +27,6 @@
html, body
height: 100%
-// Used for float
-.remove-app-scroll
- overflow: hidden
-
// Firefox
// remove dotted outline
::-moz-focus-inner, ::-moz-focus-outer