Fixed the prototype adapter.

Closes enyo#12

Author: enyo

downloads/opentip-jquery-excanvas.js

@@ -33,13 +33,15 @@ do ->
 
     # Wraps the element
     wrap: (element) ->
+      if (element instanceof NodeList or element instanceof Array)
+        throw new Error "Multiple elements provided." if element.length > 1
+        element = @unwrap element
       $(element)
-      throw new Error "Multiple elements provided." if element?.length? and element.length > 1
       element
 
     # Returns the unwrapped element
     unwrap: (element) ->
-      if element?.length? and element.length > 1
+      if element instanceof NodeList or element instanceof Array
         element[0]
       else
         element
@@ -80,7 +82,7 @@ do ->
       @wrap(element).update if escape then content.escapeHTML() else content
 
     # Appends given child to element
-    append: (element, child) -> @wrap(element).insert child
+    append: (element, child) -> @wrap(element).insert @wrap child
 
     # Add a class
     addClass: (element, className) -> @wrap(element).addClassName className
@@ -114,10 +116,10 @@ do ->
       left: offset.left, top: offset.top
 
     # Observe given eventName
-    observe: (element, eventName, observer) -> @wrap(element).observe eventName, observer
+    observe: (element, eventName, observer) -> Event.observe @wrap(element), eventName, observer
 
     # Stop observing event
-    stopObserving: (element, eventName, observer) -> @wrap(element).stopObserving eventName, observer
+    stopObserving: (element, eventName, observer) -> Event.stopObserving @wrap(element), eventName, observer
 
     # Perform an AJAX request and call the appropriate callbacks.
     ajax: (options) ->

downloads/opentip-jquery.js

@@ -262,6 +262,19 @@ describe "Generic adapter", ->
             adapter.append adapter.wrap(element), adapter.wrap(child)
             expect(element.innerHTML).to.eql "<span></span>"
 
+          it "should properly append child to element when created with adapter", ->
+            element = adapter.create "<div></div>"
+            child = adapter.create "<span></span>"
+            adapter.append element, child
+            element = adapter.unwrap element
+            child = adapter.unwrap child
+            expect(element.innerHTML).to.eql "<span></span>"
+            # Testing with wrapped as well
+            element = document.createElement "div"
+            child = document.createElement "span"
+            adapter.append adapter.wrap(element), adapter.wrap(child)
+            expect(element.innerHTML).to.eql "<span></span>"
+
         describe "offset()", ->
           it "should only return left and top", ->
             element = $("""<div style="display:block; position: absolute; left: 100px; top: 200px;"></div>""")[0]
@@ -285,6 +298,9 @@ describe "Generic adapter", ->
             element = document.createElement "a"
             adapter.observe element, "click", -> done()
             Test.clickElement element
+          it "should allow to attach an event to window", ->
+            adapter.observe window, "resize", ->
+
           it "should attach an event listener to wrapped", (done) ->
             element = document.createElement "a"
             adapter.observe adapter.wrap(element), "click", -> done()
@@ -302,6 +318,11 @@ describe "Generic adapter", ->
             Test.clickElement element
             expect(listener.callCount).to.equal 2 # Shouldn't have changed
 
+          it "should allow to remove event listener on window", ->
+            listener = sinon.stub()
+            adapter.observe window, "resize", listener
+            adapter.stopObserving window, "resize", listener
+
           it "should remove event listener from wrapped", ->
             element = document.createElement "a"
             listener = sinon.stub()

downloads/opentip-native-excanvas.js

@@ -20,10 +20,13 @@ head
   //- != js('src/adapter.ender')
 
 
-  //- != js('lib/jquery-1.8.0')
-  != js('lib/prototype-1.7.1')
+  != js('lib/jquery-1.8.0')
+  //- script
+  //-   jQuery.noConflict()
+  //- != js('lib/prototype-1.7.1')
   != js('src/opentip')
-  != js('src/adapter.prototype')
+  //- != js('src/adapter.prototype')
+  != js('src/adapter.jquery')
 
   //- != js('src/opentip')
   //- != js('src/adapter.native')
@@ -48,7 +51,7 @@ head
 
       # window.x=$(".opentip-test2").opentip("Hallo test", { target: true, tipJoint: "right", borderWidth: 0  })
 
-      element = $(".opentip-test")[0]
+      element = jQuery(".opentip-test")[0]
 
 
       window.x = new Opentip element, "Hallo test", { style: "test", tipJoint: "top" }
@@ -64,7 +67,7 @@ head
 
       window.x = new Opentip element, "Hallo test", { style: "dark", hideDelay: 0.5, tipJoint: "left", stem: true, borderWidth: 2}
 
-      element = $(".opentip-test2")[0]
+      element = jQuery(".opentip-test2")[0]
       window.x = new Opentip(element, "Hallo test", { style: "dark", stem: true, target: true, delay: 0, showEffect: false, hideDelay: 0, hideEffectDuration: 3 })
 
       window.x = new Opentip(element, "Hallo test bla test bl<br />kjsdlfksjdlf", { style: "dark", hideTrigger: "closeButton", stem: true, tipJoint: "top right", target: true, delay: 0, hideDelay: 0, showOn: "creation", borderRadius: 15 })