Merge branch 'develop'

* develop: Fixes #21 Switch out hotgraphic for a narrative when screensize isn't large
adaptlearning · Jan 28, 2014 · c663208 · c663208
2 parents 42202da + 2feeb44
commit c663208
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/adapt-contrib-hotgraphic.js b/js/adapt-contrib-hotgraphic.js
@@ -13,7 +13,7 @@ define(function(require) {
       this.listenTo(Adapt, 'remove', this.remove);
       this.listenTo(this.model, 'change:_isVisible', this.toggleVisibility);
       this.preRender();
-      if (Adapt.device.screenSize!='small') {
+      if (Adapt.device.screenSize=='large') {
         this.render();
       } else {
         this.reRender();
@@ -46,7 +46,7 @@ define(function(require) {
     },
 
     reRender: function() {
-      if (Adapt.device.screenSize == 'small') {
+      if (Adapt.device.screenSize != 'large') {
         this.replaceWithNarrative();
       }
     },