Update to Enyo and Onyx 2.0-beta4

diff --git a/www/jssrc/blerg/Blerg.js b/www/jssrc/blerg/Blerg.js
index 6eac0d8..22bfddb 100644 (file)
--- a/www/jssrc/blerg/Blerg.js
+++ b/www/jssrc/blerg/Blerg.js
@@ -15,7 +15,7 @@ enyo.kind({
         {classes: "blerg-header", components: [
             {name: "title", kind: "blerg.Title"},
             {name: "controls", kind: "blerg.Controls"},
-            {style: "clear: both"},
+            {style: "clear: both;"},
             {name: "post", kind: "blerg.Post", showing: false},
             {name: "help", kind: "blerg.Help"}
         ]},

diff --git a/www/jssrc/blerg/Controls.js b/www/jssrc/blerg/Controls.js
index 8c91c29..480e552 100644 (file)
--- a/www/jssrc/blerg/Controls.js
+++ b/www/jssrc/blerg/Controls.js
@@ -28,16 +28,16 @@ enyo.kind({
         ]},
         {name: "loggedInControls", showing: false, components: [
             {name: "greeting", components: [
-                {noDom: true, content: "Hello, "},
+                {tag: null, content: "Hello, "},
                 {name: "userlink", tag: "a"},
-                {noDom: true, content: ". "},
+                {tag: null, content: ". "},
                 {kind: "blerg.Link", content: "Logout", onNavigate: "logoutClicked"},
-                {noDom: true, content: "."}
+                {tag: null, content: "."}
             ]},
             {components: [
                 {name: "rssButton", kind: "blerg.Link", showing: false, components: [
                     {kind: "Image", src: "/images/rss.png", width: 16, height: 16},
-                    {noDom: true, content: " RSS"}
+                    {tag: null, content: " RSS"}
                 ]}
             ]},
             {classes: "blerg-controls-toolbar", components: [

diff --git a/www/jssrc/blerg/Post.js b/www/jssrc/blerg/Post.js
index 79ab126..de01c86 100644 (file)
--- a/www/jssrc/blerg/Post.js
+++ b/www/jssrc/blerg/Post.js
@@ -10,16 +10,16 @@ enyo.kind({
     resizePostContentTimeout: null,
     components: [
         {name: "helpContent", allowHtml: true, showing: false},
-        {style: "position: relative", components: [
-            {tag: "h2", content: "What's on your mind?", style: "width: 75%",},
-            {name: "showHelpLink", kind: "blerg.Link", onNavigate: "showHelp", content: "Help!", style: "position: absolute; right: 1pt; bottom: 1pt; font-weight: bold; font-size: large"},
-            {name: "hideHelpLink", kind: "blerg.Link", onNavigate: "hideHelp", content: "Hide Help", style: "position: absolute; right: 1pt; bottom: 1pt; font-weight: bold; font-size: large", showing: false}
+        {style: "position: relative;", components: [
+            {tag: "h2", content: "What's on your mind?", style: "width: 75%;",},
+            {name: "showHelpLink", kind: "blerg.Link", onNavigate: "showHelp", content: "Help!", style: "position: absolute; right: 1pt; bottom: 1pt; font-weight: bold; font-size: large;"},
+            {name: "hideHelpLink", kind: "blerg.Link", onNavigate: "hideHelp", content: "Hide Help", style: "position: absolute; right: 1pt; bottom: 1pt; font-weight: bold; font-size: large;", showing: false}
         ]},
         {kind: "onyx.InputDecorator", components: [
             {name: "postContent", classes: "content", kind: "onyx.TextArea", onkeydown: "resizePostContent", attributes: {tabindex: 4}}
         ]},
         {classes: "buttons", components: [
-            {name: "loginReminder", tag: "span", classes: "blerg-error", style: "margin-right: 8px; vertical-align: 60%", content: "You must log in before posting."},
+            {name: "loginReminder", tag: "span", classes: "blerg-error", style: "margin-right: 8px; vertical-align: 60%;", content: "You must log in before posting."},
             {kind: "onyx.Button", content: "Close", onclick: "closePost", classes: "onyx-negative", attributes: {tabindex: 6}},
             {name: "postButton", kind: "onyx.Button", content: "Post", onclick: "doPost", classes: "onyx-affirmative", disabled: true, attributes: {tabindex: 5}}
         ]},

diff --git a/www/jssrc/blerg/Record.js b/www/jssrc/blerg/Record.js
index 5d4cf23..64c8070 100644 (file)
--- a/www/jssrc/blerg/Record.js
+++ b/www/jssrc/blerg/Record.js
@@ -9,13 +9,13 @@ enyo.kind({
         record: null
     },
     components: [
-        {name: "data", noDom: true, allowHtml: true},
+        {name: "data", tag: null, allowHtml: true},
         {classes: "info", components: [
-            {noDom: true, content: "Posted "},
-            {name: "date", noDom: true},
-            {noDom: true, content: ". "},
+            {tag: null, content: "Posted "},
+            {name: "date", tag: null},
+            {tag: null, content: ". "},
             {name: "permalink", kind: "blerg.Link", content: "[permalink]"},
-            {noDom: true, content: " "},
+            {tag: null, content: " "},
             {name: "reply", kind: "blerg.Link", content: "[reply]", onNavigate: "postPopup"}
         ]}
     ],
@@ -53,15 +53,15 @@ enyo.kind({
     name: "blerg.TagRecord",
     kind: "blerg.Record",
     components: [
-        {name: "data", noDom: true, allowHtml: true},
+        {name: "data", tag: null, allowHtml: true},
         {classes: "info", components: [
-            {noDom: true, content: "Posted by "},
+            {tag: null, content: "Posted by "},
             {name: "author", kind: "blerg.Link", classes: "author ref"},
-            {noDom: true, content: " at "},
-            {name: "date", noDom: true},
-            {noDom: true, content: ". "},
+            {tag: null, content: " at "},
+            {name: "date", tag: null},
+            {tag: null, content: ". "},
             {name: "permalink", kind: "blerg.Link", content: "[permalink]"},
-            {noDom: true, content: " "},
+            {tag: null, content: " "},
             {name: "reply", kind: "blerg.Link", content: "[reply]", onNavigate: "postPopup"}
         ]}
     ],
@@ -77,8 +77,8 @@ enyo.kind({
     kind: "blerg.Record",
     components: [
         {name: "authorlink", kind: "blerg.Link", classes: "author ref"},
-        {noDom: true, content: " "},
-        {name: "data", noDom: true}
+        {tag: null, content: " "},
+        {name: "data", tag: null}
     ],
     dataChanged: function() {
         var d = this.data.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');

diff --git a/www/jssrc/blerg/SignupDialog.js b/www/jssrc/blerg/SignupDialog.js
index 3a1660f..14602f6 100644 (file)
--- a/www/jssrc/blerg/SignupDialog.js
+++ b/www/jssrc/blerg/SignupDialog.js
@@ -8,7 +8,7 @@ enyo.kind({
     modal: true,
     components: [
         {tag: "h2", content: "Sign Up"},
-        {name: "spinner", kind: "OldSchoolSpinner", showing: false, style: "position: absolute; top: 8px; right: 8px"},
+        {name: "spinner", kind: "OldSchoolSpinner", showing: false, style: "position: absolute; top: 8px; right: 8px;"},
         {kind: "onyx.Groupbox", components: [
             {kind: "onyx.InputDecorator", components: [
                 {name: "username", kind: "onyx.Input", placeholder: "Username"}

diff --git a/www/jssrc/blerg/Title.js b/www/jssrc/blerg/Title.js
index c701999..a8282fb 100644 (file)
--- a/www/jssrc/blerg/Title.js
+++ b/www/jssrc/blerg/Title.js
@@ -1,7 +1,7 @@
 enyo.kind({
     name: "blerg.Title",
     kind: "Control",
-    style: "float: left; width: 40%",
+    style: "float: left; width: 40%;",
     published: {
         section: ""
     },

diff --git a/www/jssrc/blerg/User.js b/www/jssrc/blerg/User.js
index 7871051..57366fb 100644 (file)
--- a/www/jssrc/blerg/User.js
+++ b/www/jssrc/blerg/User.js
@@ -18,9 +18,9 @@ enyo.kind({
             {name: "stalkLink", kind: "blerg.Link", content: "[stalk]", showing: false, onNavigate: "startStalking"},
             {name: "unstalkLink", kind: "blerg.Link", content: "[stop stalking]", showing: false, onNavigate: "stopStalking"},
             {name: "rssLink", kind: "blerg.Link", components: [
-                {noDom: true, content: "["},
+                {tag: null, content: "["},
                 {kind: "Image", src: "/images/rss.png", attributes: {width: 16, height: 16}},
-                {noDom: true, content: "RSS]"}
+                {tag: null, content: "RSS]"}
             ]}
         ]},
         {name: "records"},

diff --git a/www/jssrc/blerg/Welcome.js b/www/jssrc/blerg/Welcome.js
index 32301ce..2d3357e 100644 (file)
--- a/www/jssrc/blerg/Welcome.js
+++ b/www/jssrc/blerg/Welcome.js
@@ -10,14 +10,14 @@ enyo.kind({
     },
     components: [
         {components: [
-            {style: "float: right; text-align: center; margin: 0 0 1em 1em", components: [
-                {style: "font-size: 14pt; margin-bottom: 4pt", content: "Curious? Click this unbelievably obnoxious button!"},
-                {kind: "onyx.Button", content: "I want to Blërg!", style: "font-size: 40pt; padding: 1em; background-color: #C0F; color: #F88", onclick: "startSignup"}
+            {style: "float: right; text-align: center; margin: 0 0 1em 1em;", components: [
+                {style: "font-size: 14pt; margin-bottom: 4pt;", content: "Curious? Click this unbelievably obnoxious button!"},
+                {kind: "onyx.Button", content: "I want to Blërg!", style: "font-size: 40pt; padding: 1em; background-color: #C0F; color: #F88;", onclick: "startSignup"}
             ]}
         ]},
         {allowHtml: true, content: '<h2>I am 12 and what is this</h2> <p>Blërg is a microblogging platform.  Or maybe a miniblogging platform.  Blërg is not sure.  Blërg is a lot like <a href="http://twitter.com/">Twitter</a>, but aims to fix some of its idiosyncracies.  Blërg does not want to be a full blogging platform like <a href="http://wordpress.com/">Wordpress</a> or <a href="http://livejournal.com/">Livejournal</a>.  Blërg is also an <a href="/doc/">open source tagged text database engine</a> written in C that does the back-end work. Blërg\'s author finds it entertaining to anthropomorphize Blërg in the third person.</p>'},
         {name: "moreLink", kind: "blerg.Link", onNavigate: "loadMore", content: "Tell me more..."},
-        {style: "clear: both"},
+        {style: "clear: both;"},
         {name: "contentBox", allowHtml: true},
         {classes: "latest", components: [
             {tag: "h2", content: "Latest posts"},
@@ -64,7 +64,7 @@ enyo.kind({
                     content: "#" + v,
                     classes: "ref"
                 });
-                this.$.latestTags.createComponent({noDom: true, content: " "});
+                this.$.latestTags.createComponent({tag: null, content: " "});
             }
             this.$.latestTags.render();
 

diff --git a/www/jssrc/enyo b/www/jssrc/enyo
index 19b5505..f5bb327 160000 (submodule)
--- a/www/jssrc/enyo
+++ b/www/jssrc/enyo
@@ -1 +1 @@
-Subproject commit 19b550519637387cdc6fa45906dadddf4f4beb6a
+Subproject commit f5bb327ff32f0b102f447b491553a0c8a0de0fd8

diff --git a/www/jssrc/lib/OldSchoolSpinner.js b/www/jssrc/lib/OldSchoolSpinner.js
index 3c359e2..4b5ace4 100644 (file)
--- a/www/jssrc/lib/OldSchoolSpinner.js
+++ b/www/jssrc/lib/OldSchoolSpinner.js
@@ -1,7 +1,7 @@
 enyo.kind({
     name: "OldSchoolSpinner",
     kind: "Control",
-    style: "font-family: Inconsolata, Consolas, Fixedsys, fixed, monospace; font-size: 16px",
+    style: "font-family: Inconsolata, Consolas, Fixedsys, fixed, monospace; font-size: 16px;",
     content: '|',
     steps: '/-\\|',
     step: 0,

diff --git a/www/jssrc/lib/onyx b/www/jssrc/lib/onyx
index 79fa18d..386f2fd 160000 (submodule)
--- a/www/jssrc/lib/onyx
+++ b/www/jssrc/lib/onyx
@@ -1 +1 @@
-Subproject commit 79fa18db0d836871c58ea1037cf1755c8f8a4f5b
+Subproject commit 386f2fdfb2fd1e76e26864b4cf9be9374e009545