Merge pull request #5 from albrow/latest-gopherjs

Sync with latest version of gopherjs. BUG: some tests are still failing.

Author: rusco

jquery.go

@@ -50,28 +50,28 @@ const (
 )
 
 type JQuery struct {
-	o        js.Object
+	o        *js.Object
 	Jquery   string `js:"jquery"`
 	Selector string `js:"selector"` //deprecated according jquery docs
 	Length   int    `js:"length"`
 	Context  string `js:"context"`
 }
 
 type Event struct {
-	js.Object
-	KeyCode        int       `js:"keyCode"`
-	Target         js.Object `js:"target"`
-	CurrentTarget  js.Object `js:"currentTarget"`
-	DelegateTarget js.Object `js:"delegateTarget"`
-	RelatedTarget  js.Object `js:"relatedTarget"`
-	Data           js.Object `js:"data"`
-	Result         js.Object `js:"result"`
-	Which          int       `js:"which"`
-	Namespace      string    `js:"namespace"`
-	MetaKey        bool      `js:"metaKey"`
-	PageX          int       `js:"pageX"`
-	PageY          int       `js:"pageY"`
-	Type           string    `js:"type"`
+	*js.Object
+	KeyCode        int        `js:"keyCode"`
+	Target         *js.Object `js:"target"`
+	CurrentTarget  *js.Object `js:"currentTarget"`
+	DelegateTarget *js.Object `js:"delegateTarget"`
+	RelatedTarget  *js.Object `js:"relatedTarget"`
+	Data           *js.Object `js:"data"`
+	Result         *js.Object `js:"result"`
+	Which          int        `js:"which"`
+	Namespace      string     `js:"namespace"`
+	MetaKey        bool       `js:"metaKey"`
+	PageX          int        `js:"pageX"`
+	PageY          int        `js:"pageY"`
+	Type           string     `js:"type"`
 }
 
 type JQueryCoordinates struct {
@@ -198,7 +198,7 @@ func Now() float64 {
 }
 
 //static function
-func Unique(arr js.Object) js.Object {
+func Unique(arr *js.Object) *js.Object {
 	return js.Global.Get(JQ).Call("unique", arr)
 }
 
@@ -208,11 +208,11 @@ func (j JQuery) Each(fn func(int, interface{})) JQuery {
 	return j
 }
 
-func (j JQuery) Underlying() js.Object {
+func (j JQuery) Underlying() *js.Object {
 	return j.o
 }
 
-func (j JQuery) Get(i ...interface{}) js.Object {
+func (j JQuery) Get(i ...interface{}) *js.Object {
 	return j.o.Call("get", i...)
 }
 
@@ -760,7 +760,7 @@ func (j JQuery) Serialize() string {
 	return j.o.Call("serialize").String()
 }
 
-func (j JQuery) SerializeArray() js.Object {
+func (j JQuery) SerializeArray() *js.Object {
 	return j.o.Call("serializeArray")
 }
 
@@ -796,12 +796,12 @@ func GetScript(i ...interface{}) Deferred {
 	return Deferred{js.Global.Get(JQ).Call("getScript", i...)}
 }
 
-func (d Deferred) Promise() js.Object {
+func (d Deferred) Promise() *js.Object {
 	return d.Call("promise")
 }
 
 type Deferred struct {
-	js.Object
+	*js.Object
 }
 
 func (d Deferred) Then(fn ...interface{}) Deferred {

test/test/index.go

@@ -1,8 +1,8 @@
-package test
+package main
 
 import (
+	"github.com/albrow/jquery"
 	"github.com/gopherjs/gopherjs/js"
-	"github.com/gopherjs/jquery"
 	QUnit "github.com/rusco/qunit"
 	"strconv"
 	"strings"
@@ -32,12 +32,12 @@ func (s EvtScenario) Teardown() {
 
 var jQuery = jquery.NewJQuery //convenience
 
-func getDocumentBody() js.Object {
+func getDocumentBody() *js.Object {
 	return js.Global.Get("document").Get("body")
 }
 
 func stringify(i interface{}) string {
-	return js.Global.Get("JSON").Call("stringify", i).Str()
+	return js.Global.Get("JSON").Call("stringify", i).String()
 }
 
 func log(i ...interface{}) {
@@ -74,7 +74,7 @@ var (
 	countKarl = 0
 )
 
-func asyncEvent(accept bool, i int) js.Object {
+func asyncEvent(accept bool, i int) *js.Object {
 
 	dfd := jquery.NewDeferred()
 
@@ -478,7 +478,7 @@ func main() {
 
 			sa := jQuery(evt.Target).SerializeArray()
 			for i := 0; i < sa.Length(); i++ {
-				collectResults += sa.Index(i).Get("name").Str()
+				collectResults += sa.Index(i).Get("name").String()
 			}
 			assert.Equal(collectResults, "abcde", "SerializeArray")
 			evt.PreventDefault()
@@ -494,7 +494,7 @@ func main() {
 	QUnit.Test("On,One,Off,Trigger", func(assert QUnit.QUnitAssert) {
 
 		fn := func(ev jquery.Event) {
-			assert.Ok(!ev.Data == js.Undefined, "on() with data, check passed data exists")
+			assert.Ok(ev.Data != js.Undefined, "on() with data, check passed data exists")
 			assert.Equal(ev.Data.Get("foo"), "bar", "on() with data, Check value of passed data")
 		}
 
@@ -564,16 +564,16 @@ func main() {
 
 		jQuery(FIX).On(jquery.CLICK, func(e jquery.Event) {
 
-			jQuery(FIX).Find("div").Each(func(i int, elem interface{}) interface{} {
+			//jQuery(FIX).Find("div").Each(func(i int, elem interface{}) interface{} {
+			jQuery(FIX).Find("div").Each(func(i int, elem interface{}) {
 
 				style := jQuery(elem).Get(0).Get("style")
-				if style.Get("color").Str() != "blue" {
+				if style.Get("color").String() != "blue" {
 					style.Set("color", "blue")
 				} else {
 					blueCount += 1
 					style.Set("color", "")
 				}
-				return nil
 
 			})
 		})
@@ -612,13 +612,13 @@ func main() {
 		}).SetCss("font-weight", "bold")
 
 		countFontweight := 0
-		jQuery(FIX).Find("div").Each(func(i int, elem interface{}) interface{} {
+		jQuery(FIX).Find("div").Each(func(i int, elem interface{}) {
 
 			fw := jQuery(elem).Css("font-weight")
 			if fw == "bold" || fw == "700" {
 				countFontweight += 1
 			}
-			return nil
+
 		})
 		assert.Equal(countFontweight, 2, "2 divs should have font-weight = 'bold'")