patch v

0.0.11
webability-go · Apr 13, 2020 · fda2944 · fda2944
1 parent 0b6fde6
commit fda2944
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/buttonelement.go b/buttonelement.go
@@ -2,7 +2,7 @@ package wajaf
 
 type ButtonElement NodeDef
 
-func NewButtonElement(id string) ButtonElement {
+func NewButtonElement(id string, action string) ButtonElement {
 
 	e := NewNode("element", "buttonElement")
 	e.SetID(id)
@@ -11,5 +11,7 @@ func NewButtonElement(id string) ButtonElement {
 		"visible", "action", "status", "extra"})
 	//	e.RegisterKnownMessages([]string{"titleinsert", "titleupdate", "titledelete", "titleview"})
 
+	e.SetAttribute("action", action)
+
 	return e
 }
diff --git a/codeelement.go b/codeelement.go
@@ -2,10 +2,11 @@ package wajaf
 
 type CodeElement NodeDef
 
-func NewCodeElement(id string) CodeElement {
+func NewCodeElement(id string, code string) CodeElement {
 
 	e := NewNode("element", "codeElement")
 	e.SetID(id)
+	e.SetData(code)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom"})
 

diff --git a/hiddenelement.go b/hiddenelement.go
@@ -2,10 +2,11 @@ package wajaf
 
 type HiddenElement NodeDef
 
-func NewHiddenElement(id string) HiddenElement {
+func NewHiddenElement(id string, data string) HiddenElement {
 
 	e := NewNode("element", "hiddenElement")
 	e.SetID(id)
+	e.SetData(data)
 
 	return e
 }
diff --git a/hiddenfieldelement.go b/hiddenfieldelement.go
@@ -2,11 +2,10 @@ package wajaf
 
 type HiddenFieldElement NodeDef
 
-func NewHiddenFieldElement(id string, data string) HiddenFieldElement {
+func NewHiddenFieldElement(id string) HiddenFieldElement {
 
 	e := NewNode("element", "hiddenfieldElement")
 	e.SetID(id)
-	e.SetData(data)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom"})
 

diff --git a/lovfieldelement.go b/lovfieldelement.go
@@ -2,11 +2,10 @@ package wajaf
 
 type LOVFieldElement NodeDef
 
-func NewLOVFieldElement(id string, data string) LOVFieldElement {
+func NewLOVFieldElement(id string) LOVFieldElement {
 
 	e := NewNode("element", "lovfieldElement")
 	e.SetID(id)
-	e.SetData(data)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom",
 		"size", "visible", "info", "disabled", "readonly", "notnull", "helpmode"})

diff --git a/paginationelement.go b/paginationelement.go
@@ -2,11 +2,10 @@ package wajaf
 
 type PaginationElement NodeDef
 
-func NewPaginationElement(id string, data string) PaginationElement {
+func NewPaginationElement(id string) PaginationElement {
 
 	e := NewNode("element", "paginationElement")
 	e.SetID(id)
-	e.SetData(data)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom"})
 

diff --git a/textareafieldelement.go b/textareafieldelement.go
@@ -2,11 +2,10 @@ package wajaf
 
 type TextAreaFieldElement NodeDef
 
-func NewTextAreaFieldElement(id string, data string) TextAreaFieldElement {
+func NewTextAreaFieldElement(id string) TextAreaFieldElement {
 
 	e := NewNode("element", "textareafieldElement")
 	e.SetID(id)
-	e.SetData(data)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom",
 		"areawidth", "areaheight", "minlength", "maxlength", "minwords", "maxwords", "format", "visible", "info", "disabled", "readonly", "notnull", "helpmode"})

diff --git a/textfieldelement.go b/textfieldelement.go
@@ -2,11 +2,10 @@ package wajaf
 
 type TextFieldElement NodeDef
 
-func NewTextFieldElement(id string, data string) TextFieldElement {
+func NewTextFieldElement(id string) TextFieldElement {
 
 	e := NewNode("element", "textfieldElement")
 	e.SetID(id)
-	e.SetData(data)
 
 	e.RegisterKnownAttributes([]string{"display", "style", "classname", "left", "width", "right", "top", "height", "bottom",
 		"size", "minlength", "maxlength", "minwords", "maxwords", "format", "visible", "info", "disabled", "readonly", "notnull", "helpmode"})

diff --git a/wajaf_test.go b/wajaf_test.go
@@ -36,7 +36,7 @@ func TestWajaf(t *testing.T) {
 	z2 := NewSeparatorZone("", "z2")
 	c1.AddChild(z2)
 
-	e1 := NewCodeElement("code1")
+	e1 := NewCodeElement("code1", "function test() { alert('Wajaf test'); }")
 	app.AddChild(e1)
 
 	app.AddEvent("start", "function() { alert('Wajaf working'); }")