Changeset 4796

Timestamp:

08/20/06 18:05:58 (2 years ago)

Author:

madrobby

Message:

script.aculo.us: Added a custom exception to all base effects when used on non-existing DOM elements (plus added the assertRaise method to unit tests)

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/src/effects.js (modified) (5 diffs)
• spinoffs/scriptaculous/src/unittest.js (modified) (1 diff)
• spinoffs/scriptaculous/test/unit/effects_test.html (modified) (1 diff)

spinoffs/scriptaculous/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added a custom exception to all base effects when used on non-existing DOM elements, added a assertRaise method to unit tests
-
-* Fix autoscrolling when dragging an element unto a scrollable container, fixes #5017 [thx tomg]

spinoffs/scriptaculous/src/effects.js

@@ -105 +105 @@
-
-var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
-  tagifyText: function(element) {
-    if(typeof Builder == 'undefined')
@@ -355 +359 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-    if(/MSIE/.test(navigator.userAgent) && (!this.element.currentStyle.hasLayout))
@@ -373 +378 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
@@ -411 +417 @@
-Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
-  initialize: function(element, percent) {
-
+
+
-    var options = Object.extend({
-      scaleX: true,
@@ -486 +493 @@
-  initialize: function(element) {
-    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
-    this.start(options);

spinoffs/scriptaculous/src/unittest.js

@@ -333 +333 @@
-    catch(e) { this.error(e); } 
-  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try { 
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      (e.name==exceptionName) ? this.pass() : this.error(e); 
+    }
+  },
-  _isVisible: function(element) {
-    element = $(element);

spinoffs/scriptaculous/test/unit/effects_test.html

@@ -48 +48 @@
-    testBackwardsCompat: function() { with(this) {
-      assertInstanceOf(Effect.Opacity, new Effect2.Fade('sandbox'));
+    }},
+    
+    testExceptionOnNonExistingElement: function() { with(this) {
+      assertRaise('ElementDoesNotExistError', 
+        function(){new Effect.Opacity('nothing-to-see-here')});
+      assertRaise('ElementDoesNotExistError', 
+        function(){new Effect.Move('nothing-to-see-here')});
+      assertRaise('ElementDoesNotExistError', 
+        function(){new Effect.Scale('nothing-to-see-here')});
+      assertRaise('ElementDoesNotExistError', 
+        function(){new Effect.Highlight('nothing-to-see-here')});
-    }},
-