envjs 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.3.2 / 2010-04-21
+
+* don't error out on empty options and handle options within optgroups
+
 === 0.3.1 / 2010-03-30
 
 * fix problem with set history fn name

data/lib/envjs/static.js

@@ -6769,21 +6769,27 @@ __extend__(HTMLOptionElement.prototype, {
                 return;
             }
             HTMLInputCommon.prototype.setAttribute.call(this, 'selected', selectedValue);
+            var parent = this.parentNode;
+            while (parent.tagName === "OPTGROUP") {
+                parent = parent.parentNode;
+            }
             if (value) {
                 // set select's value to this option's value (this also 
                 // unselects previously selected value)
-                this.parentNode && (this.parentNode.value = this.value);
+                parent && (parent.value = this.value);
             } else {
                 // if no other option is selected, select the first option in the select
                 var i, anythingSelected;
-                for (i=0; i<this.parentNode.options.length; i++) {
-                    if (this.parentNode.options[i].selected) {
-                        anythingSelected = true;
-                        break;
+                if (parent.options) {
+                    for (i=0; i<parent.options.length; i++) {
+                        if (parent.options[i].selected) {
+                            anythingSelected = true;
+                            break;
+                        }
                     }
                 }
-                if (!anythingSelected) {
-                    this.parentNode.value = this.parentNode.options[0].value;
+                if (!anythingSelected && parent.options) {
+                    parent.value = parent.options[0].value;
                 }
             }
         }

data/lib/envjs.rb

@@ -1,6 +1,6 @@
 module Envjs
 
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   def self.js_exception_stack e
     result = %(Exception: )+e.to_s

data/src/html/option.js

@@ -28,21 +28,27 @@ __extend__(HTMLOptionElement.prototype, {
                 return;
             }
             HTMLInputCommon.prototype.setAttribute.call(this, 'selected', selectedValue);
+            var parent = this.parentNode;
+            while (parent.tagName === "OPTGROUP") {
+                parent = parent.parentNode;
+            }
             if (value) {
                 // set select's value to this option's value (this also 
                 // unselects previously selected value)
-                this.parentNode && (this.parentNode.value = this.value);
+                parent && (parent.value = this.value);
             } else {
                 // if no other option is selected, select the first option in the select
                 var i, anythingSelected;
-                for (i=0; i<this.parentNode.options.length; i++) {
-                    if (this.parentNode.options[i].selected) {
-                        anythingSelected = true;
-                        break;
+                if (parent.options) {
+                    for (i=0; i<parent.options.length; i++) {
+                        if (parent.options[i].selected) {
+                            anythingSelected = true;
+                            break;
+                        }
                     }
                 }
-                if (!anythingSelected) {
-                    this.parentNode.value = this.parentNode.options[0].value;
+                if (!anythingSelected && parent.options) {
+                    parent.value = parent.options[0].value;
                 }
             }
         }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - John Resig
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency