@soyjavi 14 лет назад
Родитель
Сommit
8b7a00b598

+ 5 - 5
examples/test/index.html

@@ -45,7 +45,7 @@
         <header class="extended">
         <header class="extended">
             <nav class="onleft">
             <nav class="onleft">
                 <a href="#kitchen-sink-scroll" data-target="aside" data-icon="user"></a>
                 <a href="#kitchen-sink-scroll" data-target="aside" data-icon="user"></a>
-                <a href="#kitchen-sink-scroll" data-target="aside" data-icon="heart" data-count="8"></a>
+                <a href="#kitchen-sink-scroll" data-article="nav-2" data-target="aside" data-icon="heart" data-count="8"></a>
             </nav>
             </nav>
             <div class="onleft">
             <div class="onleft">
                 <span class="title with-subtitle">Javi Jiménez Villar</span>
                 <span class="title with-subtitle">Javi Jiménez Villar</span>
@@ -64,10 +64,10 @@
 
 
         <footer class="toolbar with-labels">
         <footer class="toolbar with-labels">
             <nav>
             <nav>
-                <a href="#nav-1" data-target="article"  data-icon="clock" data-label="Alarm"></a>
-                <a href="#nav-2" data-target="article" data-icon="calendar" data-count="17" data-label="Calendar"></a>
-                <a href="#nav-3" data-target="article" class="current" data-icon="mail" data-label="Emails" data-count="1"></a>
-                <a href="#nav-4" data-target="article" data-icon="phone" data-label="Calls" data-count="12"></a>
+                <a href="#nav-1" data-target="article" data-title="a" data-icon="clock" data-label="Alarm"></a>
+                <a href="#nav-2" data-target="article" data-title="b" data-icon="calendar" data-count="17" data-label="Calendar"></a>
+                <a href="#nav-3" data-target="article" data-title="c" class="current" data-icon="mail" data-label="Emails" data-count="1"></a>
+                <a href="#nav-4" data-target="article" data-title="d" data-icon="phone" data-label="Calls" data-count="12"></a>
             </nav>
             </nav>
         </footer>
         </footer>
 
 

+ 1 - 1
src/boot/Lungo.Boot.Events.js

@@ -104,7 +104,7 @@ LUNGO.Boot.Events = (function(lng, undefined) {
         var section_id = lng.Router.History.current();
         var section_id = lng.Router.History.current();
         var article_id =  element.attr(ATTRIBUTE.HREF);
         var article_id =  element.attr(ATTRIBUTE.HREF);
 
 
-        lng.Router.article(section_id, article_id);
+        lng.Router.article(section_id, article_id, element);
     };
     };
 
 
     var _goAside = function(element) {
     var _goAside = function(element) {

+ 2 - 1
src/boot/Lungo.Boot.Section.js

@@ -55,7 +55,8 @@ LUNGO.Boot.Section = (function(lng, undefined) {
 
 
         var first_article_id = first_article.attr(ATTRIBUTE.ID);
         var first_article_id = first_article.attr(ATTRIBUTE.ID);
         var section_id = '#' + section.attr(ATTRIBUTE.ID);
         var section_id = '#' + section.attr(ATTRIBUTE.ID);
-        lng.View.Article.showReferenceLinks(section_id, first_article_id);
+        //@todo: tenemos que inicializar la seccion actual
+        //lng.View.Article.showReferenceLinks(section_id, first_article_id);
     };
     };
 
 
     return {
     return {

+ 12 - 8
src/router/Lungo.Router.js

@@ -37,11 +37,9 @@ LUNGO.Router = (function(lng, undefined) {
 
 
         if (_notCurrentTarget(section_id, current)) {
         if (_notCurrentTarget(section_id, current)) {
             var target = lng.dom(ELEMENT.SECTION + section_id);
             var target = lng.dom(ELEMENT.SECTION + section_id);
-
             if (target) {
             if (target) {
-                current.removeClass(CLASS.SHOW).addClass(CLASS.HIDE);
+                current.removeClass(CLASS.SHOW).addClass(CLASS.HIDE).trigger(TRIGGER.UNLOAD);
                 target.addClass(CLASS.SHOW).trigger(TRIGGER.LOAD);
                 target.addClass(CLASS.SHOW).trigger(TRIGGER.LOAD);
-
                 lng.Element.Current.section = target;
                 lng.Element.Current.section = target;
                 lng.Router.History.add(section_id);
                 lng.Router.History.add(section_id);
             }
             }
@@ -56,14 +54,20 @@ LUNGO.Router = (function(lng, undefined) {
      * @param {string} <section> Id
      * @param {string} <section> Id
      * @param {string} <article> Id
      * @param {string} <article> Id
      */
      */
-    var article = function(section_id, article_id) {
+    var article = function(section_id, article_id, element) {
         section_id = lng.Core.parseUrl(section_id);
         section_id = lng.Core.parseUrl(section_id);
         article_id = lng.Core.parseUrl(article_id);
         article_id = lng.Core.parseUrl(article_id);
-        var target = ELEMENT.SECTION + section_id + ' ' + ELEMENT.ARTICLE + article_id;
+        var current =  lng.Element.Current.article;
 
 
-        if (_exists(target) && _notCurrentTarget(target)) {
-            lng.dom(target).trigger(TRIGGER.LOAD);
-            lng.View.Article.show(section_id, article_id);
+        if (_notCurrentTarget(article_id, current)) {
+            var target = lng.dom(ELEMENT.SECTION + section_id + ' ' + ELEMENT.ARTICLE + article_id);
+            if (target) {
+                current.removeClass(CLASS.CURRENT).trigger(TRIGGER.UNLOAD);
+                target.addClass(CLASS.CURRENT).trigger(TRIGGER.LOAD);
+                lng.Element.Current.article = target;
+
+                lng.View.Article.show(section_id, article_id, element);
+            }
         }
         }
     };
     };
 
 

+ 4 - 0
src/view/Lungo.View.Article.js

@@ -31,6 +31,10 @@ LUNGO.View.Article = (function(lng, undefined) {
         }
         }
         _toggleNavItems(section_id, article_id);
         _toggleNavItems(section_id, article_id);
         _showReferenceLinks(section_id, article_id.replace('#', ''));
         _showReferenceLinks(section_id, article_id.replace('#', ''));
+
+        //@todo: Fallback android Inputs
+        //lng.Fallback.androidInputs(current_active_article_id, false);
+        //lng.Fallback.androidInputs(article_id, true);
     };
     };
 
 
     var _showReferenceLinks = function(section_id, article_id) {
     var _showReferenceLinks = function(section_id, article_id) {