Combing definitions of #disabled?

brynary · Oct 14, 2008 · 8c5216e · 8c5216e
1 parent d304564
commit 8c5216e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/webrat/core/field.rb b/lib/webrat/core/field.rb
@@ -47,7 +47,7 @@ def matches_alt?(alt)
     end
 
     def disabled?
-      !@element["disabled"].nil? && @element["disabled"] != 'false'
+      @element.attributes.has_key?("disabled") && @element["disabled"] != 'false'
     end
 
     def raise_error_if_disabled
@@ -60,10 +60,6 @@ def to_param
       param_parser.parse_query_parameters("#{name}=#{value}")
     end
 
-    def disabled?
-      @element.attributes.has_key? "disabled"
-    end
-
     def set(value)
       @value = value
     end