Skip to content

Commit

Permalink
Merge branch 'release/0.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
wachterjohannes committed Jun 26, 2014
2 parents 40bcdfb + fa85ecb commit dcb180f
Show file tree
Hide file tree
Showing 373 changed files with 106,944 additions and 61,195 deletions.
72 changes: 66 additions & 6 deletions .grunt/husky.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,70 @@
"globalize_lib": "bower_components/globalize/lib/globalize",
"typeahead": "bower_components/typeahead.js/typeahead",
"tagsManager": "bower_components/tagmanager/tagmanager",
"dropzone": "bower_components/dropzone/dropzone",
"uri-template": "bower_components/massiveart-uritemplate/uritemplate",
"ckeditor" : "vendor/ckeditor/ckeditor",
"jqueryAdapter" : "vendor/ckeditor/adapters/jquery",
"jquery-minicolors" : "bower_components/jquery-minicolors/jquery.minicolors",
"husky": "lib/husky",
"type/husky-select": "husky_components/select/select-type",
"type/husky-input": "husky_components/input/input-type",

"bootstrap-datepicker": "bower_components/bootstrap-datepicker/bootstrap-datepicker",
"datepicker-ar": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.az",
"datepicker-az": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.bg",
"datepicker-bg": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ar",
"datepicker-ca": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ca",
"datepicker-cs": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.cs",
"datepicker-cy": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.cy",
"datepicker-da": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.da",
"datepicker-de": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.de",
"datepicker-el": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.el",
"datepicker-es": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.es",
"datepicker-et": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.et",
"datepicker-sq": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.sq",
"datepicker-fa": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.fa",
"datepicker-fi": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.fi",
"datepicker-fr": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.fr",
"datepicker-gl": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.gl",
"datepicker-he": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.he",
"datepicker-hr": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.hr",
"datepicker-hu": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.hu",
"datepicker-id": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.id",
"datepicker-is": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.is",
"datepicker-it": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.it",
"datepicker-ja": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ja",
"datepicker-ka": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ka",
"datepicker-kk": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.kk",
"datepicker-kr": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.kr",
"datepicker-lt": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.lt",
"datepicker-lv": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.lv",
"datepicker-mk": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.mk",
"datepicker-ms": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ms",
"datepicker-nb": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.nb",
"datepicker-nl": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.nl",
"datepicker-nl-BE": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.nl-BE",
"datepicker-no": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.no",
"datepicker-pl": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.pl",
"datepicker-pt": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.pt",
"datepicker-pt-BR": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.pt-BR",
"datepicker-ro": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ro",
"datepicker-rs": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.rs",
"datepicker-rs-latin": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.rs-latin",
"datepicker-ru": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ru",
"datepicker-sk": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.sk",
"datepicker-sl": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.sl",
"datepicker-sv": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.sv",
"datepicker-sw": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.sw",
"datepicker-th": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.th",
"datepicker-tr": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.tr",
"datepicker-ua": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.ua",
"datepicker-vi": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.vi",
"datepicker-zh-CN": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN",
"datepicker-zh-TW": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.zh-TW",

"__component__$navigation@husky": "husky_components/navigation/main",
"__component__$column-options@husky": "husky_components/column-options/main",
"__component__$header@husky": "husky_components/header/main",
"__component__$button@husky": "husky_components/button/main",
"__component__$datagrid@husky": "husky_components/datagrid/main",
"__component__$dropdown@husky": "husky_components/dropdown/main",
"__component__$matrix@husky": "husky_components/matrix/main",
Expand All @@ -44,7 +99,9 @@
"__component__$label@husky": "husky_components/label/main",
"__component__$matcher@husky": "husky_components/matcher/main",
"__component__$process@husky": "husky_components/process/main",
"__component__$toggler@husky": "husky_components/toggler/main"
"__component__$toggler@husky": "husky_components/toggler/main",
"__component__$dropzone@husky": "husky_components/dropzone/main",
"__component__$input@husky": "husky_components/input/main"
},
"shim": {
"backbone": {
Expand All @@ -71,12 +128,13 @@
"jqueryAdapter",
"uri-template",
"typeahead",
"dropzone",
"tagsManager",
"type/husky-select",
"type/husky-input",

"husky",
"__component__$navigation@husky",
"__component__$header@husky",
"__component__$button@husky",
"__component__$column-options@husky",
"__component__$datagrid@husky",
"__component__$dropdown@husky",
Expand All @@ -97,7 +155,9 @@
"__component__$label@husky",
"__component__$matcher@husky",
"__component__$process@husky",
"__component__$toggler@husky"
"__component__$toggler@husky",
"__component__$dropzone@husky",
"__component__$input@husky"
]
}
}
35 changes: 32 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ module.exports = function(grunt) {
dest: 'dist',
src: [
'fonts/{,*/}*',
'vendor/ckeditor/{,**/}*'
'vendor/ckeditor/{,**/}*',
'vendor/jquery.minicolors.png'
]
},
{
Expand Down Expand Up @@ -298,7 +299,7 @@ module.exports = function(grunt) {
flatten: true,
src: [
'.bower_components/typeahead.js/dist/typeahead.js',
'.bower_components/typeahead.js/dist/typeahead.min.js',
'.bower_components/typeahead.js/dist/typeahead.min.js'
],
dest: 'bower_components/typeahead.js'
},
Expand All @@ -310,6 +311,33 @@ module.exports = function(grunt) {
'.bower_components/tagmanager/tagmanager.js'
],
dest: 'bower_components/tagmanager'
},
// dropzone.js
{
expand: true,
flatten: true,
src: [
'.bower_components/dropzone/downloads/dropzone.js'
],
dest: 'bower_components/dropzone'
},
// minicolors
{
expand: true,
flatten: true,
src: [
'.bower_components/jquery-minicolors/jquery.minicolors.js',
'.bower_components/jquery-minicolors/jquery.minicolors.css',
'.bower_components/jquery-minicolors/jquery.minicolors.png'
],
dest: 'bower_components/jquery-minicolors'
},
// bootstrap-datepicker
{
expand: true,
cwd: '.bower_components/bootstrap-datepicker/js/',
src: ['**'],
dest: 'bower_components/bootstrap-datepicker/'
}
]
}
Expand Down Expand Up @@ -372,7 +400,8 @@ module.exports = function(grunt) {
'compass',
'cssmin',
'copy:dist',
'copy:doc'
'copy:doc',
'yuidoc'
]);

grunt.registerTask('build:css', [
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ Install [Compass](http://compass-style.org/install/) with [animations](https://g
gem update --system
gem install compass
gem install animation --pre

Command to start an npm server, which returns data to the demos:

apimocker --config apimocker_config.json

### Grunt Tasks

Expand Down
1 change: 0 additions & 1 deletion _includes/aurajs/components/button.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ <h2>Example</h2>
<div data-aura-component="button@husky" data-aura-instance-name="save" data-aura-button-type="icon"
data-aura-background="black" data-aura-icon-type="caution" data-aura-text="Save"></div>
</div>
<script src="../js/sinon.js"></script>
<script src="../js/jquery.js"></script>

<script data-main="app" src="../js/require.js"></script>
Expand Down
1 change: 0 additions & 1 deletion _includes/aurajs/components/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ <h2>Example</h2>
{% highlight html %}
<div data-aura-component="header@husky" data-aura-button-type="saveDelete"></div>

<script src="../js/sinon.js"></script>
<script src="../js/jquery.js"></script>

<script data-main="app" src="../js/require.js"></script>
Expand Down
1 change: 0 additions & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<!-- Vendor scripts -->
<script src="{{ page.base_url }}demos/aurajs/js/sinon.js"></script>
<script src="{{ page.base_url }}demos/aurajs/js/jquery.js"></script>
<script src="{{ page.base_url }}demos/aurajs/js/require.js"></script>
<script src="{{ page.base_url }}assets/js/underscore/underscore.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions apimocker
124 changes: 124 additions & 0 deletions apimocker_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"note": "...Successfully found husky configs for apimocker...",
"mockDirectory": "apimocks",
"quiet": false,
"port": "7878",
"latency": 700,
"allowedDomains": ["http://husky.lo"],
"allowedHeaders": ["Content-Type", "Cache-Control", "X-Requested-With"],
"webServices": {

"test": {
"mockFile": "test.json",
"verbs": ["GET"]
},

"admin/api/datagrid": {
"verbs": ["GET"],
"mockFile": "datagrid/default.json",
"switch": "page"
},
"admin/api/datagrid/all": {
"verbs": ["GET"],
"mockFile": "datagrid/all.json"
},
"admin/api/datagrid/sort": {
"verbs": ["GET"],
"mockFile": "datagrid/sort.json"
},
"admin/api/datagrid/search": {
"verbs": ["GET"],
"mockFile": "datagrid/search.json"
},
"admin/api/datagrid/1": {
"verbs": ["PUT"],
"mockFile": "datagrid/id1.edited.json"
},
"admin/api/datagrid/:id": {
"verbs": ["PUT"],
"httpStatus": 400,
"mockFile": "datagrid/edited.json",
"switch": "id"
},
"admin/api/datagrid/groups": {
"verbs": ["GET"],
"mockFile": "datagrid/groups.json"
},
"admin/api/datagrid/children": {
"verbs": ["GET"],
"mockFile": "datagrid/children/level1.json"
},
"admin/api/datagrid/children/all": {
"verbs": ["GET"],
"mockFile": "datagrid/children/all.json"
},
"admin/api/datagrid/actualchildren": {
"verbs": ["GET"],
"mockFile": "datagrid/children/children.json",
"switch": "parent"
},
"admin/api/datagrid/children/sorted": {
"verbs": ["GET"],
"mockFile": "datagrid/children/sorted.json"
},

"admin/api/autocomplete": {
"verbs": ["GET"],
"mockFile": "auto-complete/countries.json",
"switch": "query"
},

"admin/api/autocompletelist": {
"verbs": ["GET"],
"mockFile": "auto-complete-list/tags.json",
"switch": "query"
},

"admin/api/columnnavigation": {
"verbs": ["GET"],
"mockFile": "column-navigation/columns.json",
"switch": "children"
},
"admin/api/columnnavigation/children": {
"verbs": ["GET"],
"mockFile": "column-navigation/nodes.json",
"switch": "parent"
},

"admin/api/columnoptions": {
"verbs": ["GET"],
"mockFile": "column-options/columns.json"
},

"admin/api/dropdown": {
"verbs": ["GET"],
"mockFile": "dropdown/items.json"
},

"admin/api/navigation": {
"verbs": ["GET"],
"mockFile": "navigation/items.json"
},

"admin/api/smartcontent": {
"verbs": ["GET"],
"mockFile": "smart-content/items.json",
"switch": "dataSource"
},

"admin/api/tabs": {
"verbs": ["GET"],
"mockFile": "tabs/items.json"
},

"admin/api/validation/autocomplete": {
"verbs": ["GET"],
"mockFile": "validation/autocomplete/prefetch.json"
},

"admin/api/dropzone": {
"verbs": ["POST"],
"mockFile": "dropzone/uploaded.json"
}
}
}
1 change: 1 addition & 0 deletions apimocks/auto-complete-list/queryTagX.tags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 1, "_embedded": [{"id": 103, "name": "TagX"}]}
1 change: 1 addition & 0 deletions apimocks/auto-complete-list/tags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 0, "_embedded": []}
1 change: 1 addition & 0 deletions apimocks/auto-complete/countries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 4, "_embedded": [{"id": 1, "name": "Deutschland"}, {"id": 2, "name": "Frankreich"}, {"id": 3, "name": "USA"}, {"id": 4, "name": "Kroatien"}]}
1 change: 1 addition & 0 deletions apimocks/auto-complete/queryI.countries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 2, "_embedded": [{"id": 5, "name": "Indien"}, {"id": 6, "name": "Irgendwo"}, {"id": 7, "name": "Irgendwo2"}]}
1 change: 1 addition & 0 deletions apimocks/auto-complete/queryZype.countries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 1, "_embedded": [{"id": 18, "name": "Zypern"}]}
1 change: 1 addition & 0 deletions apimocks/auto-complete/querydoesnotexist.countries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"total": 0, "_embedded": []}
Loading

0 comments on commit dcb180f

Please sign in to comment.