Skip to content

Commit 93be9e6

Browse files
evoluteurevoluteur
committed
Cleanups.
1 parent e5f4787 commit 93be9e6

File tree

4 files changed

+46
-39
lines changed

4 files changed

+46
-39
lines changed

‎demo/index.html‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -52,38 +52,39 @@ <h1 id="title">Demos</h1>
5252
<div class="evo-content2">
5353

5454
<div id="evol" class="">
55-
56-
<p><br/>These sample applications are not anything you haven't seen before.
57-
The interesting thing is that these demos are not done with templates, CSS and custom Javascript but
58-
are only configured with UI-models.
59-
</p>
60-
61-
<p>By changing the ui-model, Evolutility set of views can behave as any of the following:
62-
<div class="demo-links links-bih">
63-
<div><a href="#todo" data-id="todo"><img src="pix/todo.gif" class="evo-icon-16">To Do</a></div>
64-
<div><a href="#contact" data-id="contact"><img src="pix/contact.gif" class="evo-icon-16">AddressBook</a></div>
65-
<div><a href="#winecellar" data-id="wine"><img src="pix/wine.gif" class="evo-icon-16">Wine cellar</a></div>
66-
<div><a href="#comics/cards" data-id="comics"><img src="pix/comics.png" class="evo-icon-16">Graphic novels</a></div>
67-
</div>
68-
<p>... or anything you can imagine by making new ui-models.</p>
69-
70-
<p>The demo apps are configured with these UI models: <a href="javascript:showUIModel('todo')">To Do</a>,
71-
<a href="javascript:showUIModel('contact')">Addressbook</a>,
72-
<a href="javascript:showUIModel('winecellar')">Wine Cellar</a>,
73-
<a href="javascript:showUIModel('comics')">Graphic novels</a>.
74-
<small id="hide_def" style="display:none;"><a href="javascript:hideUIModel('winecellar')">[Hide]</a></small></p>
75-
</p>
76-
<div style="display:none;" id="uimodel"></div>
77-
78-
<p>If you are really curious, you may want to play with the <a href="test.html#test/list">Test Object</a> which is a contrived object with fields of all possible field types.
79-
80-
You can also <a href="custom-app.html">customize the UI-model</a> to see how the views change accordingly.
81-
</p>
82-
83-
<p>Note: The data for these demos is stored in your browser's local storage
84-
(using <a href="https://github.com/jeromegn/Backbone.localStorage" target="bbls">Backbone.localStorage</a>) but Evolutility can be configured for a REST API.
85-
</p>
86-
55+
<div id="demo-txt">
56+
57+
<p><br/>These sample applications are not anything you haven't seen before.
58+
The interesting thing is that these demos are not done with templates, CSS and custom Javascript but
59+
are only configured with UI-models.
60+
</p>
61+
62+
<p>By changing the ui-model, Evolutility set of views can behave as any of the following:
63+
<div class="demo-links links-bih">
64+
<div><a href="#todo" data-id="todo"><img src="pix/todo.gif" class="evo-icon-16">To Do</a></div>
65+
<div><a href="#contact" data-id="contact"><img src="pix/contact.gif" class="evo-icon-16">AddressBook</a></div>
66+
<div><a href="#winecellar" data-id="wine"><img src="pix/wine.gif" class="evo-icon-16">Wine cellar</a></div>
67+
<div><a href="#comics/cards" data-id="comics"><img src="pix/comics.png" class="evo-icon-16">Graphic novels</a></div>
68+
</div>
69+
<p>... or anything you can imagine by making new ui-models.</p>
70+
71+
<p>The demo apps are configured with these UI models: <a href="javascript:showUIModel('todo')">To Do</a>,
72+
<a href="javascript:showUIModel('contact')">Addressbook</a>,
73+
<a href="javascript:showUIModel('winecellar')">Wine Cellar</a>,
74+
<a href="javascript:showUIModel('comics')">Graphic novels</a>.
75+
<small id="hide_def" style="display:none;"><a href="javascript:hideUIModel('winecellar')">[Hide]</a></small></p>
76+
</p>
77+
<div style="display:none;" id="uimodel"></div>
78+
79+
<p>If you are really curious, you may want to play with the <a href="test.html#test/list">Test Object</a> which is a contrived object with fields of all possible field types.
80+
81+
You can also <a href="custom-app.html">customize the UI-model</a> to see how the views change accordingly.
82+
</p>
83+
84+
<p>Note: The data for these demos is stored in your browser's local storage
85+
(using <a href="https://github.com/jeromegn/Backbone.localStorage" target="bbls">Backbone.localStorage</a>) but Evolutility can be configured for a REST API.
86+
</p>
87+
</div>
8788
</div>
8889

8990
<div class="clearfix"></div>

‎doc/index.html‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ <h3><a href="views.html">Views</a></h3>
7979
<section>
8080

8181
<h3><a href="ui-model.html">UI-Models</a></h3>
82-
<div>A declarative language to configure the views and map fields on screen to attributes in your Backbone models.
83-
82+
<div>
83+
A declarative language to configure the views and map fields on screen to attributes in your Backbone models.
84+
8485
<div class="links-bh mt10">
8586
<a href="ui-model.html#object">object</a> -
8687
<a href="ui-model.html#field">field</a> -
@@ -89,12 +90,18 @@ <h3><a href="ui-model.html">UI-Models</a></h3>
8990
<a href="ui-model.html#tab">tab</a>
9091
</div>
9192

92-
</div>
93-
93+
</div>
9494
</section>
9595
<section>
9696
<h3><a href="controller.html">Controller</a></h3>
97-
<div>A controller and a toolbar to manage the views and make them act together as a Single Page App.
97+
<div>
98+
A controller and a toolbar to manage the views and make them act together as a Single Page App.
99+
100+
<div class="links-bh mt10">
101+
<a href="controller.html#app">App</a> -
102+
<a href="controller.html#toolbar">Toolbar</a>
103+
</div>
104+
98105
</div>
99106
</section>
100107
<section>

‎js/dico/d3-bubbles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Bubbles.prototype.changeBubblesSize = function (sizeFieldId){
188188
if(sizeFieldId){
189189
var sizes = _.map(this.data, function(d){
190190
var v=d[sizeFieldId];
191-
return (v===null || v===isNaN)?0:v;
191+
return (v===null || v===isNaN || _.isUndefined(v))?0:v;
192192
});
193193
this.plotScale = d3.scale.log().domain([ _.min(sizes), _.max(sizes)]).range([10, 25]);
194194
cs.transition().duration(500)

‎js/dico/ui.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
var Evol = Evol || {};
1111
Evol.hashLov = {};
1212
Evol.ViewAction = {};
13-
Evol.Version = '0.5';
1413

1514
Evol.UI = {
1615

0 commit comments

Comments
 (0)