Permalink
Browse files

Merging

  • Loading branch information...
2 parents 6e00edc + d78a43b commit 543f89bc16ef890f762157e60d41148aa8a58d0d @davebalmer davebalmer committed Aug 19, 2010
Showing with 496 additions and 38 deletions.
  1. +67 −17 css/aluminum/aluminum.css
  2. +3 −1 js/core/subject.js
  3. +2 −1 js/data/Makefile
  4. +205 −5 js/jo.js
  5. +16 −7 js/jo_min.js
  6. +3 −1 js/ui/Makefile
  7. +37 −0 js/ui/flexrow.js
  8. +13 −4 js/ui/list.js
  9. +84 −0 js/ui/table.js
  10. +66 −2 samples/test.js
View
@@ -6,7 +6,7 @@ body {
overflow: hidden;
}
-joview, jotitle, jolabel, jocard, jodivider, jocontrol, jocontainer, jocaption, jobutton, jotabbar, jolist, jomenu {
+joview, jotitle, jolabel, jocard, jotable, jodivider, jocontrol, jocontainer, jocaption, jobutton, jotabbar, jolist, jomenu {
text-align: left;
display: block;
padding: 0;
@@ -144,44 +144,45 @@ jocard {
}
jocard>* {
display: block;
+/*
-webkit-box-flex: 0;
-moz-box-flex: 0;
box-flex: 0;
+*/
}
jofooter {
display: block;
display: -webkit-box;
display: -moz-box;
display: box;
-/*
- position: absolute;
- bottom: 0px;
- left: 0px;
- right: 0px;
-*/
+
-webkit-box-flex: 2;
-webkit-box-orient: vertical;
-webkit-box-align: stretch;
-webkit-box-pack: end;
+
-moz-box-flex: 2;
-moz-box-orient: vertical;
-moz-box-align: stretch;
-moz-box-pack: end;
+
box-flex: 2;
box-orient: vertical;
box-align: stretch;
box-pack: end;
+
margin: 0;
}
jofooter>* {
- display: block;
- -webkit-box-align: start;
- -moz-box-align: start;
- box-align: start;
- -webkit-box-flex: 0;
- -moz-box-flex: 0;
- box-flex: 0;
+ -webkit-box-align: end;
+ -moz-box-align: end;
+ box-align: end;
+/*
+ -webkit-box-flex: 2;
+ -moz-box-flex: 2;
+ box-flex: 2;
+*/
}
johtml {
@@ -195,7 +196,7 @@ johtml>* {
margin-right: 0;
}
-jolist {
+jolist, jotable {
display: block;
margin: 0 0 10px 0;
}
@@ -209,11 +210,11 @@ jolistitem {
cursor: pointer;
}
-jolistitem.selected {
+jolistitem.selected, jotable .selected {
background: #bbb;
}
-jomenu, jolist {
+jomenu, jolist, jotable {
display: block;
margin: 0 0 10px 0;
}
@@ -464,4 +465,53 @@ jostack.hide {
opacity: 0;
}
+joflexrow {
+ display: block;
+ display: -webkit-box;
+ display: -moz-box;
+ display: box;
+/*
+ -webkit-box-flex: 1;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: stretch;
+ -moz-box-flex: 1;
+ -moz-box-orient: horizontal;
+ -moz-box-align: stretch;
+ box-flex: 1;
+ box-orient: vertical;
+ box-align: stretch;
+*/
+ margin: 0;
+}
+
+joflexrow>* {
+ -webkit-box-flex: 1;
+ -moz-box-flex: 1;
+ box-flex: 1;
+}
+
+joflexcol {
+ display: block;
+ display: -webkit-box;
+ display: -moz-box;
+ display: box;
+
+ -webkit-box-flex: 1;
+ -webkit-box-orient: vertical;
+ -webkit-box-align: stretch;
+ -moz-box-flex: 1;
+ -moz-box-orient: vertical;
+ -moz-box-align: stretch;
+ box-flex: 1;
+ box-orient: vertical;
+ box-align: stretch;
+
+ margin: 0;
+}
+
+joflexcol>* {
+ -webkit-box-flex: 1;
+ -moz-box-flex: 1;
+ box-flex: 1;
+}
View
@@ -74,7 +74,7 @@ joSubject.prototype = {
this.subscriptions.push(o);
- return true;
+ return this.subject;
},
unsubscribe: function(call, observer) {
@@ -88,6 +88,8 @@ joSubject.prototype = {
&& (this.subscriptions[i].observer == "undefined" || this.subscriptions[i].observer === observer))
this.subscriptions[i].slice(i, 1);
}
+
+ return this.subject;
},
fire: function(data) {
View
@@ -1,7 +1,8 @@
DATA = database.js \
datasource.js \
sqldatasource.js \
- preference.js
+ preference.js \
+ lawnchair.js
all:
cat $(DATA) >> ../jo.js
Oops, something went wrong.

0 comments on commit 543f89b

Please sign in to comment.