Merge pull request #37 from sorvell/master

g-component and g-panels minor changes
Polymer · Nov 14, 2012 · 6fc1a4a · 6fc1a4a
2 parents 60a091a + eb8e6b7
commit 6fc1a4a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/src/g-component.html b/src/g-component.html
@@ -300,7 +300,7 @@
               // filter out 'mustached' values, these are to be
               // replaced with bound-data and are not runtime
               // values themselves
-              if (value.indexOf(bindModel.mustache) >= 0) {
+              if (value.search(bindModel.mustache) >= 0) {
                 return;
               }
               // deserialize Boolean or Number values from attribute

diff --git a/src/g-panels.html b/src/g-panels.html
@@ -66,7 +66,7 @@
           var fromPanel = this.panelAtIndex(this.lastIndex), 
               toPanel = this.panelAtIndex(this.index),
               forward = Boolean(this.index > this.lastIndex);
-          if (this.canTransition() && fromPanel && toPanel) {
+          if (this.canTransition(fromPanel, toPanel, forward)) {
             this.beginTransition(fromPanel, toPanel, forward);
           } else {
             this.finishTransition(fromPanel, toPanel, forward);
@@ -144,9 +144,9 @@
       get count() {
         return this.getPanels().length;
       },
-      canTransition: function() {
-        return Boolean(this.transitionNode && 
-            this.transitionNode.canTransition());
+      canTransition: function(inFrom, inTo, inForward) {
+        return Boolean(this.transitionNode && inFrom && inTo &&
+            this.transitionNode.canTransition(inFrom, inTo, inForward));
       },
       beginTransition: function(inFrom, inTo, inForward) {
         if (this.transitionNode) {
@@ -168,7 +168,9 @@
       // note: cannot use hidden attr for this since it's trumped by display
       // setting e.g. hidden + display: -webkit-flex == showing.
       enablePanelShowing: function(inPanel, inEnable) {
-        inPanel.style.display = inEnable ? null : 'none';
+        if (inPanel) {
+          inPanel.style.display = inEnable ? null : 'none';
+        }
       },
       next: function() {
         this.index++;

diff --git a/src/panel-transitions/g-panel-transition.html b/src/panel-transitions/g-panel-transition.html
@@ -6,38 +6,42 @@
  */
 -->
 <element name="g-panel-transition">
-  <!-- remove blank template when polyfill issue #62 is fixed -->
-  <template></template>
   <script>
     this.component({
       prototype: {
         transitionClass: 'transition',
         timeout: 1000,
         //* indicates only one panel should be displayed at a time.
         highlander: true,
-        // TODO(sorvell): promote to g-component?
         get base() {
           return this.__proto__.__proto__;
         },
         setup: function(inPanels) {
           this.panels = inPanels;
-          var showing;
           this.panels.getPanels().forEach(function(p, i) {
-            p.classList.add(this.transitionClass);
-            showing = !this.highlander || (i == inPanels.index);
-            this.panels.enablePanelShowing(p, showing);
+            this.setupPanel(p, i);
           }, this);
           this.finishListener = this.finish.bind(this);
         },
         teardown: function() {
           this.panels.getPanels().forEach(function(p, i) {
-            p.classList.remove(this.transitionClass);  
-            p.style.opacity = p.style.webkitTransform = null;
-            if (this.highlander) {
-              this.panels.enablePanelShowing(p, true);
-            };
+            this.teardownPanel(p, i);
           }, this);
         },
+        setupPanel: function(inPanel, inIndex) {
+          if (this.transitionClass) {
+            inPanel.classList.add(this.transitionClass);
+          }
+          var showing = !this.highlander || (inIndex == this.panels.index);
+          this.panels.enablePanelShowing(inPanel, showing);
+        },
+        teardownPanel: function(inPanel, inIndex) {
+          inPanel.classList.remove(this.transitionClass);  
+          inPanel.style.opacity = inPanel.style.webkitTransform = null;
+          if (this.highlander) {
+            this.panels.enablePanelShowing(inPanel, true);
+          };
+        },
         canTransition: function() {
           return true;
         },