Skip to content
This repository has been archived by the owner on Sep 3, 2022. It is now read-only.

Commit

Permalink
Minor bug fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
rbiggs committed Dec 21, 2012
1 parent d8b7aec commit 455701b
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 30 deletions.
5 changes: 5 additions & 0 deletions chui/chui.android.js
Expand Up @@ -5,6 +5,7 @@ This version works with ChocolateChip.js, jQuery or Zepto.
For jQuery, ChocolateChip-UI requires as a minimum version 1.7.1
When using Zepto, make sure you have the following modules included in your build: zepto, event, detect, fx, fx_methods, ajax, form, data, selector, stack.
*/

(function() {
var _$ = null;
if (window.$chocolatechip) {
Expand Down Expand Up @@ -1337,6 +1338,10 @@ When using Zepto, make sure you have the following modules included in your buil
$(selector).find('label').text(value);
$(selector).find('uibutton:first-of-type').addClass('disabled');
$(selector).find('uibutton:last-of-type').removeClass('disabled');
},

resetStepper : function(selector) {
return this.resetSpinner(selector);
}
});

Expand Down
5 changes: 4 additions & 1 deletion chui/chui.ios.css
Expand Up @@ -1534,7 +1534,7 @@ tablecell > cellsubtitle {
tablecell[ui-implements=disclosure] > celltitle:only-child,
tablecell[ui-implements=detail-disclosure] > celltitle:only-child,
tablecell[ui-implements=add] > celltitle:only-child {
width: 90%;
width: 90% !important;
}
tablecell[ui-implements=disclosure] > celltitle,
tablecell[ui-implements=detail-disclosure] > celltitle,
Expand Down Expand Up @@ -1838,6 +1838,7 @@ deletedisclosure {

deletedisclosure > span {
display: none;
position: relative;
}
deletedisclosure.checked {
font: bold 26px/14px Verdana;
Expand All @@ -1854,6 +1855,8 @@ deletedisclosure.checked {
deletedisclosure.checked > span {
display: inline;
padding-left: 0px;
top: -2px;
left: -2px;
}
tableview.ui-show-delete-disclosures deletedisclosure {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion chui/chui.ios.js
Expand Up @@ -1499,7 +1499,7 @@ When using Zepto, make sure you have the following modules included in your buil
var editButtonTmpl = $.concat('<uibutton role="button" ui-kind="deletionListEditButton" ui-bar-align="right" ui-implements="edit"',' ui-button-labels="',label1,' ',label2,'"><label>', label1, '</label></uibutton>');
$(toolbarEl).prepend(deleteButtonTmpl);
$(toolbarEl).append(editButtonTmpl);
var deleteDisclosure = '<deletedisclosure><span><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="20" height="20" viewBox="0 0 56 56" id="svg4441" xml:space="preserve"><g transform="matrix(3.627675,0,0,4.1708195,-0.38756952,2.0459536)" id="layer1"><path d="m 11.593506,0.85181027 c 0,0 -2.8782812,1.78368203 -4.3315408,3.46282313 C 5.8087055,5.9937746 5.2466215,6.7535798 5.2466215,6.7535798 4.5883903,5.9988655 4.4131283,5.7074764 3.5602554,4.9454794 L 1.6930171,6.6720302 c 0.8705482,0.5389683 1.1118812,0.5228901 1.6820456,0.9472989 0.6284449,0.4677906 1.6685596,1.2039011 2.2759527,2.014857 L 6.65407,7.7313389 C 7.5655527,6.0022084 8.3358445,4.1589192 11.560016,1.9084663 l 0.03349,-1.05665603 z" id="rect5112" style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></svg></span></deletedisclosure>';
var deleteDisclosure = '<deletedisclosure><span><?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="18" height="18" viewBox="0 0 48 48" id="svg3804" xml:space="preserve"><path d="M 35.465895,6.1655247 43.279492,11.956238 21.764356,40.49005 5.4540477,27.811351 l 5.8969333,-7.344633 8.291376,6.489244 z" id="path3908" style="fill:#ffffff;fill-opacity:1;stroke:none" /></svg></span></deletedisclosure>';
$._each($.els(options.selector + " > tablecell"), function(idx, ctx) {
$(ctx).prepend(deleteDisclosure);
});
Expand Down
15 changes: 10 additions & 5 deletions examples-ios-chocolatechip/app/chui/chui.ios.css
Expand Up @@ -10,14 +10,14 @@
ChocolateChip-UI
Three yummy ingredients make this something to sink your teeth into:
ChococlateChip.js: It's tiny but delicious
chui.ios.css: Good looks do impress
chui.ios.js: The magic to make it happen
ChUI.css: Good looks do impress
ChUI.js: The magic to make it happen
Also staring WAML--Web App Markup Language: no more masquerading as a Web page.
WAML makes coding a Web app logical and straightforward, the way it was meant to be.
Copyright 2011 Robert Biggs: www.chocolatechip-ui.com
License: BSD
Version: 2.0 Beta
Version: 2.1
*/
html, body {
Expand Down Expand Up @@ -100,9 +100,11 @@ subview > scrollpanel {
overflow: hidden;
padding-bottom: 45px;
}
subview[ui-associations] {
subview {
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow-y: auto;
Expand Down Expand Up @@ -1532,7 +1534,7 @@ tablecell > cellsubtitle {
tablecell[ui-implements=disclosure] > celltitle:only-child,
tablecell[ui-implements=detail-disclosure] > celltitle:only-child,
tablecell[ui-implements=add] > celltitle:only-child {
width: 90%;
width: 90% !important;
}
tablecell[ui-implements=disclosure] > celltitle,
tablecell[ui-implements=detail-disclosure] > celltitle,
Expand Down Expand Up @@ -1836,6 +1838,7 @@ deletedisclosure {

deletedisclosure > span {
display: none;
position: relative;
}
deletedisclosure.checked {
font: bold 26px/14px Verdana;
Expand All @@ -1852,6 +1855,8 @@ deletedisclosure.checked {
deletedisclosure.checked > span {
display: inline;
padding-left: 0px;
top: -2px;
left: -2px;
}
tableview.ui-show-delete-disclosures deletedisclosure {
display: block;
Expand Down
15 changes: 10 additions & 5 deletions examples-ios-jquery/app/chui/chui.ios.css
Expand Up @@ -10,14 +10,14 @@
ChocolateChip-UI
Three yummy ingredients make this something to sink your teeth into:
ChococlateChip.js: It's tiny but delicious
chui.ios.css: Good looks do impress
chui.ios.js: The magic to make it happen
ChUI.css: Good looks do impress
ChUI.js: The magic to make it happen
Also staring WAML--Web App Markup Language: no more masquerading as a Web page.
WAML makes coding a Web app logical and straightforward, the way it was meant to be.
Copyright 2011 Robert Biggs: www.chocolatechip-ui.com
License: BSD
Version: 2.0 Beta
Version: 2.1
*/
html, body {
Expand Down Expand Up @@ -100,9 +100,11 @@ subview > scrollpanel {
overflow: hidden;
padding-bottom: 45px;
}
subview[ui-associations] {
subview {
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow-y: auto;
Expand Down Expand Up @@ -1532,7 +1534,7 @@ tablecell > cellsubtitle {
tablecell[ui-implements=disclosure] > celltitle:only-child,
tablecell[ui-implements=detail-disclosure] > celltitle:only-child,
tablecell[ui-implements=add] > celltitle:only-child {
width: 90%;
width: 90% !important;
}
tablecell[ui-implements=disclosure] > celltitle,
tablecell[ui-implements=detail-disclosure] > celltitle,
Expand Down Expand Up @@ -1836,6 +1838,7 @@ deletedisclosure {

deletedisclosure > span {
display: none;
position: relative;
}
deletedisclosure.checked {
font: bold 26px/14px Verdana;
Expand All @@ -1852,6 +1855,8 @@ deletedisclosure.checked {
deletedisclosure.checked > span {
display: inline;
padding-left: 0px;
top: -2px;
left: -2px;
}
tableview.ui-show-delete-disclosures deletedisclosure {
display: block;
Expand Down
15 changes: 10 additions & 5 deletions examples-ios-zepto/app/chui/chui.ios.css
Expand Up @@ -10,14 +10,14 @@
ChocolateChip-UI
Three yummy ingredients make this something to sink your teeth into:
ChococlateChip.js: It's tiny but delicious
chui.ios.css: Good looks do impress
chui.ios.js: The magic to make it happen
ChUI.css: Good looks do impress
ChUI.js: The magic to make it happen
Also staring WAML--Web App Markup Language: no more masquerading as a Web page.
WAML makes coding a Web app logical and straightforward, the way it was meant to be.
Copyright 2011 Robert Biggs: www.chocolatechip-ui.com
License: BSD
Version: 2.0 Beta
Version: 2.1
*/
html, body {
Expand Down Expand Up @@ -100,9 +100,11 @@ subview > scrollpanel {
overflow: hidden;
padding-bottom: 45px;
}
subview[ui-associations] {
subview {
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
overflow-y: auto;
Expand Down Expand Up @@ -1532,7 +1534,7 @@ tablecell > cellsubtitle {
tablecell[ui-implements=disclosure] > celltitle:only-child,
tablecell[ui-implements=detail-disclosure] > celltitle:only-child,
tablecell[ui-implements=add] > celltitle:only-child {
width: 90%;
width: 90% !important;
}
tablecell[ui-implements=disclosure] > celltitle,
tablecell[ui-implements=detail-disclosure] > celltitle,
Expand Down Expand Up @@ -1836,6 +1838,7 @@ deletedisclosure {

deletedisclosure > span {
display: none;
position: relative;
}
deletedisclosure.checked {
font: bold 26px/14px Verdana;
Expand All @@ -1852,6 +1855,8 @@ deletedisclosure.checked {
deletedisclosure.checked > span {
display: inline;
padding-left: 0px;
top: -2px;
left: -2px;
}
tableview.ui-show-delete-disclosures deletedisclosure {
display: block;
Expand Down
16 changes: 3 additions & 13 deletions icons/check_mark.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions icons/delete_check_mark2.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 455701b

Please sign in to comment.