refactor the code

SC5 · Feb 12, 2015 · c68cea5 · c68cea5
1 parent a98642a
commit c68cea5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 35 deletions.
diff --git a/lib/app/js/controllers/element.js b/lib/app/js/controllers/element.js
@@ -17,17 +17,8 @@ angular.module('sgApp')
       updatePageData();
     });
 
-    function previousSection() {
-      var sections, result, mod, sec, i, m;
-      if (!Styleguide.sections.data) {
-        return;
-      }
-      sections = Styleguide.sections.data;
-
-      // Find correct element definition from styleguide data
-      result = sections.filter(function(item) {
-        return reference === item.reference;
-      });
+    function previousSection(sections, result) {
+      var sec, i, m;
       sec = result[0];
       m = modifier;
       if (result.length > 0) {
@@ -46,30 +37,19 @@ angular.module('sgApp')
                 }
               }
             }
-            if (sec.modifiers.length > 0) {
+            if (sec.hasOwnProperty('modifiers') && sec.modifiers.length > 0) {
               m = sec.modifiers.length + 1;
             } else {
               return false;
             }
           }
         }
-
-        mod = sec.reference + '-' + (parseInt(m) - 1);
+        return sec.reference + '-' + (parseInt(m) - 1);
       }
-      return mod;
     }
 
-    function nextSection() {
-      var sections, result, mod, sec, i, m;
-      if (!Styleguide.sections.data) {
-        return;
-      }
-      sections = Styleguide.sections.data;
-
-      // Find correct element definition from styleguide data
-      result = sections.filter(function(item) {
-        return reference === item.reference;
-      });
+    function nextSection(sections, result) {
+      var sec, i, m;
       sec = result[0];
       m = modifier;
       if (result.length > 0) {
@@ -94,10 +74,8 @@ angular.module('sgApp')
             }
           }
         }
-
-        mod = sec.reference + '-' + (parseInt(m) + 1);
+        return sec.reference + '-' + (parseInt(m) + 1);
       }
-      return mod;
     }
 
     function updatePageData() {
@@ -127,8 +105,8 @@ angular.module('sgApp')
         }
 
         // Set the actual page content
-        $scope.previousSection = previousSection();
-        $scope.nextSection = nextSection();
+        $scope.previousSection = previousSection(sections, result);
+        $scope.nextSection = nextSection(sections, result);
         $scope.section = element;
         $scope.variables = Variables.variables;
         $scope.markup = $filter('setVariables')(element.wrappedMarkup, $scope.variables);

diff --git a/lib/app/sass/app.scss b/lib/app/sass/app.scss
@@ -1217,13 +1217,13 @@ Styleguide 4.4
 }
 
 .navigation-section {
+  padding: 10px;
   position: fixed;
-  z-index: 1000;
+  z-index: 99999;
   right: 0;
   display: inline;
   .next-nav, .prev-nav {
     float: left;
-    margin: 10px;
     cursor: pointer;
   }
 }

diff --git a/lib/app/views/element-fullscreen.html b/lib/app/views/element-fullscreen.html
@@ -1,6 +1,10 @@
 <div class="navigation-section">
-  <a ng-hide="!previousSection" ui-sref="app.fullscreen({section: previousSection })" target="_blank">Previous</a>
-  <a ng-hide="!nextSection" ui-sref="app.fullscreen({section: nextSection })" target="_blank">Next</a>
+  <a ng-hide="!previousSection" ui-sref="app.fullscreen({section: previousSection })" target="_blank">
+    <i class="fa fa-arrow-left"></i>
+  </a>
+  <a ng-hide="!nextSection" ui-sref="app.fullscreen({section: nextSection })" target="_blank">
+    <i class="fa fa-arrow-right"></i>
+  </a>
 </div>
 <shadow-dom>
   <div ng-bind-html="markup | addWrapper | unsafe" dynamic-compile></div>