Merge branch 'release/0.7'

massiveart · Sep 11, 2014 · dd28f3f · dd28f3f
2 parents 890942b + 4cd24c5
commit dd28f3f
Show file tree

Hide file tree

Showing 95 changed files with 6,776 additions and 5,137 deletions.
diff --git a/apimocker_config.json b/apimocker_config.json
@@ -61,6 +61,10 @@
             "verbs": ["GET"],
             "mockFile": "datagrid/children/sorted.json"
         },
+        "admin/api/datagrid/fields": {
+            "verbs": ["GET"],
+            "mockFile": "datagrid/fields.json"
+        },
 
         "admin/api/autocomplete": {
             "verbs": ["GET"],

diff --git a/apimocks/datagrid/fields.json b/apimocks/datagrid/fields.json
@@ -0,0 +1,55 @@
+[{
+    "name":"id",
+    "translation":"public.id",
+    "disabled":true,
+    "default":false,
+    "sortable":true,
+    "type":"",
+    "width":"",
+    "minWidth":"",
+    "editable":false
+},
+{
+    "name":"content1",
+    "translation":"Content 1",
+    "disabled":false,
+    "default":false,
+    "sortable":true,
+    "type":"title",
+    "width":"25%",
+    "minWidth":"",
+    "editable":false
+},
+{
+    "name":"content2",
+    "translation":"Content 2",
+    "disabled":false,
+    "default":false,
+    "sortable":true,
+    "type":"title",
+    "width":"25%",
+    "minWidth":"",
+    "editable":false
+},
+{
+    "name":"content3",
+    "translation":"Content 3",
+    "disabled":false,
+    "default":false,
+    "sortable":true,
+    "type":"bytes",
+    "width":"25%",
+    "minWidth":"",
+    "editable":false
+},
+{
+    "name":"date",
+    "translation":"Date",
+    "disabled":false,
+    "default":false,
+    "sortable":true,
+    "type":"",
+    "width":"25%",
+    "minWidth":"",
+    "editable":false
+}]
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "husky",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "main": "js/husky.js",
   "dependencies": {
     "backbone": "~1.0.0",

diff --git a/demos/datagrid/script.js b/demos/datagrid/script.js
@@ -37,9 +37,11 @@ require(['lib/husky'], function(Husky) {
                             validation: true,
                             addRowTop: true,
                             showHead: true, // false to hide table-head
-                            //fullWidth: true, // uncomment for full-width mode
+                            fullWidth: true, // uncomment for full-width mode
                             contentContainer: '#content',
-                            highlightSelected: true
+                            highlightSelected: true,
+                            croppedMaxLength: 5,
+                            stickyHeader: true
                         },
                         thumbnail: {
                         }
@@ -49,43 +51,7 @@ require(['lib/husky'], function(Husky) {
                     searchFields: ['fullName'],
                     columnOptionsInstanceName: '',
                     el: '#datagrid',
-                    matchings: [
-                        {
-                            content: 'Content 1',
-                            width: "25%",
-                            name: "content1",
-                            editable: true,
-                            sortable: true,
-                            type: 'title',
-                            validation: {
-                                required: true
-                            }
-                        },
-                        {
-                            content: 'Content 2',
-                            width: "25%",
-                            name: "content2",
-                            editable: false,
-                            sortable: true,
-                            type: 'bytes',
-                            validation: {
-                                required: true
-                            }
-                        },
-                        {
-                            content: 'Content 3',
-                            width: "25%",
-                            name: "content3",
-                            type: 'thumbnails'
-                        },
-                        {
-                            content: 'Date',
-                            width: "25%",
-                            sortable: true,
-                            name: 'date',
-                            type: 'date'
-                        }
-                    ]
+                    matchings: 'http://husky.lo:7878/admin/api/datagrid/fields'
                 }
             },
             {

diff --git a/demos/input/index.html b/demos/input/index.html
@@ -89,6 +89,7 @@ <h1>Husky input demo</h1>
                 <div data-aura-component="input@husky"
                      data-aura-skin="date"
                      data-aura-instance-name="date"
+                     data-aura-datepicker-options='{ "startDate": "2014-08-01", "endDate":"2014-09-03"}'
                      data-form="true"
                      data-type="husky-input"
                      data-validation-required="true"
@@ -124,6 +125,24 @@ <h1>Husky input demo</h1>
             </div>
         </div>
     </div>
+
+    <div class="grid-row">
+        <div class="grid-col-6">
+            <div class="form-group">
+                <label>Disabled</label>
+                <div data-aura-component="input@husky"
+                     data-aura-skin="email"
+                     data-aura-instance-name="disabled-input"
+                     data-aura-disabled="true"
+                     data-form="true"
+                     data-type="husky-input"
+                     data-validation-required="true"
+                     data-mapper-property="color"
+                     data-value="#CCCCCC"></div>
+            </div>
+        </div>
+    </div>
+
     <div class="grid-row m-top-30 m-bottom-30"></div>
     <div class="grid-row">
         <div class="grid-col-2">

diff --git a/demos/overlay/index.html b/demos/overlay/index.html
@@ -303,7 +303,8 @@
                                             sizeRelativeTo: '#overlaySlides .slide-0 .overlay-content',
                                             wrapper: {height: 100},
                                             showEdit: false,
-                                            showStatus: false
+                                            showStatus: false,
+                                            responsive: false
                                         }
                                     }
                                 ]

diff --git a/demos/select/index.html b/demos/select/index.html
@@ -510,7 +510,7 @@ <h1>Husky Select Demo</h1>
                 console.log(form.mapper.getData());
             });
 
-            $('#ddms5').on('changed', function() {
+            $('#ddms5').on('change', function() {
                 alert("i got changed");
             });
         });