Skip to content
This repository has been archived by the owner on Feb 2, 2020. It is now read-only.

Commit

Permalink
Update to deliteful 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
clmath committed May 12, 2015
1 parent 1f74417 commit 1bcb4ac
Show file tree
Hide file tree
Showing 34 changed files with 120 additions and 132 deletions.
28 changes: 26 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ Then install dependencies with bower (or manually from github if you prefer to):

## How to use

To load the minified layer you need to wrap your main `require` call with another `require`, requiring `"deliteful-build/layer"`. Then you should continue to
refer to modules with `"deliteful/foo"`.
### `baseUrl` is the directory containing `deliteful-build`.
This is the most common use-case so the needed configuration is built in the layer.
To load the minified layer you just need to wrap your main `require` call with another `require`, requiring `"deliteful-build/layer"`.
Then you should continue to refer to modules with `"deliteful/foo"`.

For example, this code:
```js
Expand All @@ -42,6 +44,28 @@ require(["deliteful-build/layer"], function() {
});
```

### Other `baseUrl`

If `baseUrl` is not the directory containing `deliteful-build`, custom configuration is needed.

```js
require.config({
paths: {
"deliteful": "path/to/deliteful-build",
"decor": "path/to/decor-build",
"delite": "path/to/delite-build",
"dpointer": "path/to/dpointer-build",
"ecma402": "path/to/ecma402-build"
}
});
```


## Bug reporting

Issues should be filled against the source version of this project at [ibm-js/deliteful](https://github.com/ibm-js/deliteful)


## Licensing

This project is distributed by the Dojo Foundation and licensed under the ["New" BSD License](./LICENSE).
Expand Down
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "deliteful-build",
"version": "0.6.0",
"version": "0.7.0",
"dependencies": {
"jquery": ">=2.1",
"requirejs": "2.1.x",
"dstore": "1.0.x",
"decor-build": "0.5.x",
"delite-build": "0.6.x",
"decor-build": "0.6.x",
"delite-build": "0.7.x",
"dpointer-build": "0.5.x",
"ecma402-build": "0.3.x"
},
Expand All @@ -23,6 +23,6 @@
"CONTRIBUTING.md"
],
"devDependencies": {
"deliteful": "0.6.0"
"deliteful": "0.7.0"
}
}
1 change: 0 additions & 1 deletion css/layer.css

This file was deleted.

1 change: 1 addition & 0 deletions layer.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions layer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion layer.map

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions samples/Button.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/Button",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register) {
register.parse();
], function () {
document.body.style.display = "";
});

Expand Down Expand Up @@ -68,8 +66,8 @@
<body style="display: none; background-color:white;">
<div class="group">
<button is="d-button" label="Default button" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" class="d-button-blue" label="Blue button" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" class="d-button-red" label="Red button" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" class="d-button-primary" label="Blue button" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" class="d-button-danger" label="Red button" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" iconClass = 'd-icon-phone' label="Custom with icon" class="d-button-green" onclick="alert(this.label + ' clicked.');"></button>
<button is="d-button" iconClass = 'd-icon-phone d-big-icon' label="Custom with icon" class="d-button-green" onclick="alert(this.label + ' clicked.');"></button>
</div>
Expand Down
18 changes: 5 additions & 13 deletions samples/Buttons.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,25 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/Checkbox",
"deliteful/Switch",
"deliteful/Button",
"deliteful/ToggleButton",
"deliteful/RadioButton",
"requirejs-domready/domReady!"
], function (register) {
register.parse();
], function () {
document.body.style.display = "";
});


});
</script>
<style>
.d-icon-cut {
background-image: url('./images/paste.gif'); /* Contains both object and action icons in a sprite image for the enabled state. */
width: 16px;
height: 16px;
background-repeat: no-repeat;
.d-icon-cut:before {
content: url('./images/paste.gif'); /* Contains both object and action icons in a sprite image for the enabled state. */
}
.d-icon-copy {
background-image: url('./images/copy.gif'); /* Contains both object and action icons in a sprite image for the enabled state. */
width: 16px;
height: 16px;
background-repeat: no-repeat;
.d-icon-copy:before {
content: url('./images/copy.gif'); /* Contains both object and action icons in a sprite image for the enabled state. */
}
p {
line-height: 1.7em;
Expand Down
6 changes: 2 additions & 4 deletions samples/Checkbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>

<title>Switch samples</title>
<title>Checkbox samples</title>

<script type="text/javascript" src="../../requirejs/require.js"></script>

Expand All @@ -20,12 +20,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/Checkbox",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, Checkbox) {
register.parse();
], function () {
document.body.style.display = "";
});

Expand Down
8 changes: 3 additions & 5 deletions samples/Combobox.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"dstore/Memory",
"deliteful/list/List",
"deliteful/Combobox",
Expand All @@ -30,8 +29,7 @@
"deliteful/Checkbox",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, Memory, List) {
register.parse();
], function (Memory, List) {

startsWith.on("change", function () {
comboTeams.filterMode = "startsWith";
Expand Down Expand Up @@ -112,7 +110,7 @@
Your favorite team (single choice):
</p>
<d-combobox selectionMode="single" autoFilter="true" id="comboTeams">
<d-list righttextAttr="world-cup-victories" categoryAttr: "region"
<d-list righttextAttr="world-cup-victories" categoryAttr="region"
store="storeTeams"></d-list>
</d-combobox>
<p>
Expand All @@ -128,7 +126,7 @@
<d-radio-button name="radio" id="is" checked="false"></d-radio-button>
<label for="is">is</label>
<d-checkbox id="ignoreCase" checked></d-checkbox>
<label for="ignoreCase">Ignore Case</label></p>
<label for="ignoreCase">Ignore Case</label>
</fieldset>
<br/>
<p>
Expand Down
4 changes: 1 addition & 3 deletions samples/LinearLayout.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/LinearLayout",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function(register){
register.parse();
], function(){
document.body.style.display = "";
});

Expand Down
8 changes: 3 additions & 5 deletions samples/ProgressBar-basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ProgressBar",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register) {
register.parse();
document.body.style.display = "";
], function () {
document.body.style.visibility = "visible";
});

});
Expand Down Expand Up @@ -53,7 +51,7 @@
</style>

</head>
<body style="display: none">
<body style="visibility: hidden">
<p><strong>ProgressBar sample - basic</strong></p>

<p>This sample shows how to declare and customize a progress bar.</p>
Expand Down
3 changes: 1 addition & 2 deletions samples/ProgressBar-handler.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register) {
register.parse();

var label = document.getElementById("lb");
var progressBar = document.getElementById("pb1");
var loadBtn = document.getElementById("loadBtn");
Expand Down Expand Up @@ -63,6 +61,7 @@
};

label.innerHTML = "Value: indeterminate";
register.deliver();
progressBar.observe(updateLabel); // update label everytime widget changes

document.body.style.display = "";
Expand Down
5 changes: 1 addition & 4 deletions samples/ProgressBar-messages.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ProgressBar",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register) {
register.parse();

], function () {
var label = document.getElementById("lb");
var progressBar = document.getElementById("pb1");
var loadBtn = document.getElementById("loadBtn");
Expand Down
4 changes: 1 addition & 3 deletions samples/ProgressIndicator-basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ProgressIndicator",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, ProgressIndicator) {
register.parse();
], function () {
document.body.style.display = "";
});

Expand Down
4 changes: 1 addition & 3 deletions samples/ProgressIndicator-overlay.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ProgressIndicator",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, ProgressIndicator) {
register.parse();
], function () {

var overlay = document.getElementById("overlay");
var progressIndicator = document.getElementById("pi");
Expand Down
5 changes: 1 addition & 4 deletions samples/ProgressIndicator-percentage.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ProgressIndicator",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, ProgressIndicator) {
register.parse();

], function () {
var label = document.getElementById("lb");
var progressIndicator = document.getElementById("pi");
var loadBtn = document.getElementById("loadBtn");
Expand Down
6 changes: 1 addition & 5 deletions samples/ResponsiveColumns.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/LinearLayout",
"deliteful/ResponsiveColumns",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function(register){
register.parse();

rc.deliver();
], function(){
screenClassLabel.innerHTML = rc.screenClass;

document.body.style.display = "";
Expand Down
4 changes: 1 addition & 3 deletions samples/ScrollableContainer.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/ScrollableContainer",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function(register){
register.parse();
], function(){
document.body.style.display = "";
});

Expand Down
4 changes: 1 addition & 3 deletions samples/Select.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"dstore/Memory",
"deliteful/Select",
"deliteful/Button",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function (register, Memory) {
register.parse();
], function (Memory) {

var storeTeams = new Memory({}),
storePlayers = new Memory({});
Expand Down
4 changes: 1 addition & 3 deletions samples/SidePane-all.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/SidePane",
"deliteful/Button",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function(register){
register.parse();
], function(){
document.body.style.display = "";
});

Expand Down
4 changes: 1 addition & 3 deletions samples/SidePane-overlay.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
<script type="text/javascript">
require(["deliteful-build/layer"], function(){
require([
"delite/register",
"deliteful/SidePane",
"deliteful/Button",
"delite/theme!delite/themes/{{theme}}/global.css", // page level CSS
"requirejs-domready/domReady!"
], function(register){
register.parse();
], function(){
document.body.style.display = "";
});

Expand Down
Loading

0 comments on commit 1bcb4ac

Please sign in to comment.