soyjavi преди 13 години
родител
ревизия
26b2616805

+ 2 - 2
src/Lungo.Constants.js

@@ -20,8 +20,8 @@ Lungo.Constants = {
     },
 
     QUERY: {
-        LIST_IN_ARTICLE: 'article.list, aside.list',
-        ARTICLE_SCROLLABLE: 'article.scroll'
+        LIST_IN_ELEMENT: 'article.list, aside.list',
+        ELEMENT_SCROLLABLE: 'aside.scroll, article.scroll'
     },
 
     CLASS: {

+ 9 - 9
src/boot/Lungo.Boot.Layout.js

@@ -25,8 +25,8 @@ Lungo.Boot.Layout = (function(lng, undefined) {
         lng.Fallback.fixPositionInAndroid();
 
         _initFirstSection();
-        _initArticleElement(QUERY.LIST_IN_ARTICLE, _createListElement);
-        _initArticleElement(QUERY.ARTICLE_SCROLLABLE, _scrollFix);
+        _initElement(QUERY.LIST_IN_ELEMENT, _createListElement);
+        _initElement(QUERY.ELEMENT_SCROLLABLE, _scrollFix);
     };
 
     var _initFirstSection = function() {
@@ -38,7 +38,7 @@ Lungo.Boot.Layout = (function(lng, undefined) {
         lng.Router.History.add(section_id);
     };
 
-    var _initArticleElement = function(selector, callback) {
+    var _initElement = function(selector, callback) {
         var found_elements = lng.dom(selector);
         for (var i = 0, len = found_elements.length; i < len; i++) {
             var element = lng.dom(found_elements[i]);
@@ -46,16 +46,16 @@ Lungo.Boot.Layout = (function(lng, undefined) {
         }
     };
 
-    var _createListElement = function(article) {
-        if (article.children().length === 0) {
-            var article_id = article.attr(ATTRIBUTE.ID);
-            article.append(ELEMENT.LIST);
+    var _createListElement = function(element) {
+        if (element.children().length === 0) {
+            var element_id = element.attr(ATTRIBUTE.ID);
+            element.append(ELEMENT.LIST);
         }
     };
 
 
-    var _scrollFix = function(article) {
-        article[0].addEventListener('touchstart', function(event) {
+    var _scrollFix = function(element) {
+        element[0].addEventListener('touchstart', function(event) {
             scrollTop = this.scrollTop;
             if(scrollTop <= 1) {
                 this.scrollTop = 1;

+ 6 - 6
src/stylesheets/Lungo.layout.styl

@@ -17,12 +17,12 @@ body
   &[data-position="fixed"] > section
     position: fixed
 
-    &[data-transition]
-      display: block !important
-      transition-property( opacity, z-index, transform )
-      transition-duration( TRANSITION_TIME )
-      transition-timing-function( DEFAULT_TRANSITION )
-      backface-visibility( hidden )
+  & [data-transition]
+    display: block !important
+    transition-property( opacity, z-index, transform )
+    transition-duration( TRANSITION_TIME )
+    transition-timing-function( DEFAULT_TRANSITION )
+    backface-visibility( hidden )
 
 section
   top:  0

+ 1 - 1
src/stylesheets/css/Lungo.layout.css

@@ -12,7 +12,7 @@ body[data-position="absolute"] > section {
 body[data-position="fixed"] > section {
   position: fixed;
 }
-body[data-position="fixed"] > section[data-transition] {
+body [data-transition] {
   display: block !important;
   -webkit-transition-property: opacity z-index transform;
   -moz-transition-property: opacity z-index transform;

+ 1 - 0
src/stylesheets/css/Lungo.widgets.notification.css

@@ -8,6 +8,7 @@
  */
 .notification {
   position: absolute;
+  top: 0;
   width: 100%;
   height: 100%;
   z-index: 3;

+ 4 - 1
src/stylesheets/lungo.widgets.notification.styl

@@ -12,9 +12,11 @@
 
 OPACITY = rgba(0,0,0,0.75)
 LOADING = 104px
+WINDOW_WIDTH = 280px
 
 .notification
   position: absolute
+  top: 0
   width: 100%
   height: 100%
   z-index: 3
@@ -51,10 +53,11 @@ LOADING = 104px
         display: none
 
     &:not(.growl)
-      width: 280px
+      width: WINDOW_WIDTH
       left: 0
       top: 0
       margin: (HEADER_FOOTER_HEIGHT / 2) auto 0
+
       transform(translateY(100%))
       &.show
         transform(translateY(0%))

+ 1 - 1
vendor/build.sh

@@ -23,7 +23,7 @@ decho "============================ LUNGO COMPILER ============================"
     #Main
     DIR=$LUNGO_SOURCES$LUNGO_NAMESPACE
     decho "  [DIR]: $LUNGO_SOURCES"
-    FILES="js Init.js Core.js Dom.js Service.js Constants.js Events.js Notification.js Fallback.js Resource.js"
+    FILES="js Init.js Core.js Dom.js Service.js Constants.js Events.js Notification.js Fallback.js Resource.js Scroll.js"
     for file in ${FILES} ; do
         FILES_TO_COMPILE=$FILES_TO_COMPILE" --js "$DIR$file
         FILES_TO_JOIN=$FILES_TO_JOIN" "$DIR$file