lib/teacup/style.rb in teacup-0.3.10 vs lib/teacup/style.rb in teacup-0.3.11

@@ -32,22 +32,22 @@
       properties = Style.new.update(self)
       properties.stylename = self.stylename
       properties.stylesheet = self.stylesheet
 
       # at this point, we really DO need the orientation
-      orientation = UIApplication.sharedApplication.statusBarOrientation unless orientation
+      unless orientation
+        orientation = UIApplication.sharedApplication.statusBarOrientation
+      end
 
       # first, move orientation settings into properties "base" level.
       if orientation
         Overrides[orientation].each do |orientation_key|
           if override = properties.delete(orientation_key)
             # override is first, so it takes precedence
             if override.is_a? Hash
               Teacup::merge_defaults override, properties, properties
-            elsif not properties.has_key? orientation_key
-              properties[orientation_key] = override
             end
-            properties.supports[orientation_key] = properties[orientation_key] ? true : false
+            properties.supports[orientation_key] = !!override
           end
         end
       end
 
       # delete all of them from `properties`