Skip to content

Commit

Permalink
Merge branch 'master' into fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
jconniff committed Jul 17, 2012
2 parents 3af6c5c + 95211fc commit 7a9eb5d
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 21 deletions.
6 changes: 5 additions & 1 deletion src/anim/HISTORY.md
@@ -1,10 +1,14 @@
Anim Change History
===================

3.6.0
-----
* Allow for pass through to object properties for arbitrary animation.

3.5.1
-----

* No changes.
* No changes.

3.5.0
-----
Expand Down
12 changes: 12 additions & 0 deletions src/common/node/selleck.js
Expand Up @@ -10,9 +10,21 @@ var dirs = fs.readdirSync(base);

var examples = [];

var ignore = function(json) {

if (json.name === 'test' || json.name.indexOf('-deprecated') > 0) {
return true;
}

return false;
};

var parseJSON = function(file) {
var json = JSON.parse(fs.readFileSync(file, 'utf8'));
var windows = {};
if (ignore(json)) {
return;
}
if (json && json.examples) {
var name = json.name;
json.examples.forEach(function(c) {
Expand Down
25 changes: 5 additions & 20 deletions src/common/tests/selleck.xml
Expand Up @@ -28,9 +28,9 @@
<url>autocomplete/ac-local.html</url>
<url>autocomplete/ac-tagging.html</url>
<url>autocomplete/ac-yql.html</url>
<url>button/button-basic.html</url>
<url>button/button-group.html</url>
<url>button/button-plugin.html</url>
<url>button/button.html</url>
<url>button/cssbutton.html</url>
<url>cache/cache-basic.html</url>
<url>cache/cache-offline.html</url>
Expand Down Expand Up @@ -83,13 +83,6 @@
<url>datasource/datasource-local.html</url>
<url>datasource/datasource-offlinecache.html</url>
<url>datasource/datasource-polling.html</url>
<url>datatable-deprecated/datatable-basic.html</url>
<url>datatable-deprecated/datatable-dsget.html</url>
<url>datatable-deprecated/datatable-dsio.html</url>
<url>datatable-deprecated/datatable-formatting.html</url>
<url>datatable-deprecated/datatable-nestedcols.html</url>
<url>datatable-deprecated/datatable-scroll.html</url>
<url>datatable-deprecated/datatable-sort.html</url>
<url>datatable/datatable-basic.html</url>
<url>datatable/datatable-chkboxselect.html</url>
<url>datatable/datatable-dsget.html</url>
Expand Down Expand Up @@ -134,7 +127,7 @@
<url>editor/editor-nodechange.html</url>
<url>event-custom/flow-example.html</url>
<url>event/basic-example.html</url>
<url>event/swipe-example.html</url>
<url>event/swipe-example-content.html</url>
<url>event/synth-example.html</url>
<url>graphics/graphics-customshape.html</url>
<url>graphics/graphics-drag.html</url>
Expand Down Expand Up @@ -186,8 +179,8 @@
<url>overlay/overlay-tooltip.html</url>
<url>overlay/overlay-xy.html</url>
<url>panel/dialog.html</url>
<url>panel/panel-animate.html</url>
<url>panel/panel-form.html</url>
<url>panel/panel-animate-example.html</url>
<url>panel/panel-form-example.html</url>
<url>profiler/profiler-object-example.html</url>
<url>profiler/profiler-simple-example.html</url>
<url>recordset/recordset-basic.html</url>
Expand Down Expand Up @@ -219,17 +212,9 @@
<url>tabview/tabview-basic.html</url>
<url>tabview/tabview-fromjs.html</url>
<url>tabview/tabview-yql.html</url>
<url>test/test-advanced-test-options.html</url>
<url>test/test-array-tests.html</url>
<url>test/test-async-event-tests.html</url>
<url>test/test-async-test.html</url>
<url>test/test-simple-example.html</url>
<url>transition/transition-basic.html</url>
<url>transition/transition-usage.html</url>
<url>transition/transition-view.html</url>
<url>uploader-deprecated/uploader-multiple.html</url>
<url>uploader-deprecated/uploader-simple.html</url>
<url>uploader-deprecated/uploader-withvars.html</url>
<url>uploader/uploader-data.html</url>
<url>uploader/uploader-dd.html</url>
<url>uploader/uploader-multiple.html</url>
Expand All @@ -254,4 +239,4 @@
<url>yui/yui-ua.html</url>
<url>yui/yui-yui2.html</url>
</tests>
</yuitest>
</yuitest>
5 changes: 5 additions & 0 deletions src/cssbase/HISTORY.md
@@ -1,6 +1,11 @@
CSS Base Change History
=======================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/cssfonts/HISTORY.md
@@ -1,6 +1,11 @@
CSS Fonts Change History
========================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/cssgrids/HISTORY.md
@@ -1,6 +1,11 @@
CSS Grids Change History
========================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/cssreset/HISTORY.md
@@ -1,6 +1,11 @@
CSS Reset Change History
========================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/dom/HISTORY.md
@@ -1,6 +1,11 @@
DOM Change History
==================

3.6.0
-----

* No changes.

3.5.1
-----
* Bug fix: Fix multiple grouped queries for IE. [Ticket 2532155]
Expand Down
5 changes: 5 additions & 0 deletions src/intl/HISTORY.md
@@ -1,6 +1,11 @@
Intl Change History
===================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/node-flick/HISTORY.md
@@ -1,6 +1,11 @@
Flick Node Plugin Change History
================================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
4 changes: 4 additions & 0 deletions src/node/HISTORY.md
@@ -1,6 +1,10 @@
Node Change History
===================

3.6.0
-----
* No changes.

3.5.1
-----
* Bug fix: Force case-insensitive removeAttribute in IE. [Ticket 2532192]
Expand Down
5 changes: 5 additions & 0 deletions src/tabview/HISTORY.md
@@ -1,6 +1,11 @@
TabView Change History
======================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down
5 changes: 5 additions & 0 deletions src/transition/HISTORY.md
@@ -1,6 +1,11 @@
Transition Change History
=========================

3.6.0
-----

* No changes.

3.5.1
-----

Expand Down

0 comments on commit 7a9eb5d

Please sign in to comment.