bumped versions

.grunt/husky.json

@@ -8,10 +8,10 @@
             "underscore": "bower_components/underscore/underscore",
             "eventemitter": "bower_components/eventemitter2/lib/eventemitter2",
             "backbone": "bower_components/backbone/backbone",
-            "html5sortable": "vendor/html5sortable/html5sortable",
             "requirejs": "bower_components/requirejs/require",
             "text": "bower_components/requirejs-text/text",
             "jquery": "bower_components/jquery/jquery",
+            "html.sortable": "bower_components/html.sortable/html.sortable",
             "husky-validation": "bower_components/husky-validation/dist/validation",
             "globalize_lib": "bower_components/globalize/lib/globalize",
             "typeahead": "bower_components/typeahead.js/typeahead.bundle",
@@ -24,6 +24,12 @@
             "husky": "lib/husky",
             "type/husky-select": "husky_components/select/select-type",
             "type/husky-input": "husky_components/input/input-type",
+            "type/url-input": "husky_components/url-input/url-input",
+
+            "services/husky/util": "husky_services/util",
+            "services/husky/mediator": "husky_services/mediator",
+            "services/husky/translator": "husky_services/translator",
+            "services/husky/url-validator": "husky_services/url-validator",
 
             "bootstrap-datepicker": "bower_components/bootstrap-datepicker/bootstrap-datepicker",
             "datepicker-ar": "bower_components/bootstrap-datepicker/locales/bootstrap-datepicker.az",
@@ -96,13 +102,12 @@
             "__component__$ckeditor@husky": "husky_components/ckeditor/main",
             "__component__$overlay@husky": "husky_components/overlay/main",
             "__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__$dropzone@husky": "husky_components/dropzone/main",
             "__component__$input@husky": "husky_components/input/main",
             "data-navigation": "husky_components/data-navigation",
-            "__component__$data-navigation@husky": "husky_components/data-navigation/main"
+            "__component__$data-navigation@husky": "husky_components/data-navigation/main",
+            "__component__$url-input@husky": "husky_components/url-input/main"
         },
         "shim": {
             "backbone": {
@@ -128,16 +133,22 @@
             "aura/ext/mediator",
             "aura/ext/components",
             "husky-validation",
-            "html5sortable",
             "globalize_lib",
             "ckeditor",
             "jqueryAdapter",
+            "html.sortable",
             "uri-template",
             "typeahead",
             "dropzone",
             "tagsManager",
             "type/husky-select",
             "type/husky-input",
+            "type/url-input",
+
+            "services/husky/util",
+            "services/husky/mediator",
+            "services/husky/translator",
+            "services/husky/url-validator",
 
             "husky",
             "__component__$navigation@husky",
@@ -158,12 +169,11 @@
             "__component__$ckeditor@husky",
             "__component__$overlay@husky",
             "__component__$label@husky",
-            "__component__$matcher@husky",
-            "__component__$process@husky",
             "__component__$toggler@husky",
             "__component__$dropzone@husky",
             "__component__$input@husky",
-            "__component__$data-navigation@husky"
+            "__component__$data-navigation@husky",
+            "__component__$url-input@husky"
         ]
     }
 }

CHANGELOG.md

@@ -1,6 +1,19 @@
 CHANGELOGS:
 ===========
 
+2015/10/28 v0.15.0
+==================
+- datagrid
+    - added infinite-scroll-pagination
+    - added change-page event
+
+- toolbar
+    - new blueish style
+    - options changes
+
+- services
+    - New util and mediator service
+
 2015/04/20 v0.11.0
 ==================
 

Gruntfile.js

@@ -241,6 +241,17 @@ module.exports = function(grunt) {
                         ],
                         dest: 'bower_components/jquery/'
                     },
+                    // html.sortable
+                    {
+                        expand: true,
+                        flatten: true,
+                        src: [
+                            '.bower_components/html.sortable/dist/html.sortable.js',
+                            '.bower_components/html.sortable/dist/html.sortable.min.js',
+                            '.bower_components/html.sortable/dist/html.sortable.min.js.map'
+                        ],
+                        dest: 'bower_components/html.sortable/'
+                    },
                     // requirejs
                     {
                         expand: true,

README.md

@@ -2,10 +2,6 @@
 
 Husky is an awesome front-end framework.
 
-## Read the documentation
-
-[Documentation](https://github.com/massiveart/husky/tree/develop/docs/md/README.md)
-
 ## How to contribute like a boss
 
 First install all necessary npm modules by running:

UPGRADE.md

@@ -0,0 +1,25 @@
+# Upgrade
+
+## Dev-develop
+
+### Infinite scroll
+The infinite-scroll-extension got refactored. To initialize infinite-scroll on an element, use
+"this.sandbox.infiniteScroll.initialize(selector, callback)" instead of "this.sandbox.infiniteScroll(selector, callback)" now.
+To unbind an infinite-scroll handler, use "this.sandbox.infiniteScroll.destroy(selector)"
+
+### Toolbar
+- 'blueish' style got removed. 'big' style was added
+- options.data renamed to options.buttons
+- changes in the buttons api:
+    - 'type' deleted
+    - 'iconSize' deleted
+    - 'hideTitle' deleted
+    - 'items' renamed in 'dropdownItems'
+    - 'itemsOptions' renamed in 'dropdownOptions'
+        - 'markable' renamed in 'markSelected'
+        - 'changeButton' new instead of 'type: "select"'
+        - 'translate' removed
+        - 'languageNamespace' removed
+
+### Util-Extension
+- events 'husky.util.load.data' and 'husky.util.save.data' got removed

apimocks/datagrid/default.json

@@ -1,7 +1,7 @@
 {
     "_links": {
         "self": {
-            "href": "http://husky.lo:7878/admin/api/datagrid?pageSize=4"
+            "href": "http://husky.lo:7878/admin/api/datagrid?pageSize=4&sortBy=content1&sortOrder=desc"
         },
         "first": {
             "href": "http://husky.lo:7878/admin/api/datagrid?page=1&pageSize=4"

apimocks/datagrid/fields.json

@@ -15,21 +15,21 @@
     "disabled":false,
     "default":false,
     "sortable":true,
-    "type":"title",
+    "type":"number",
     "width":"25%",
     "minWidth":"",
-    "editable":true
+    "editable":false
 },
 {
     "name":"content2",
     "translation":"Content 2",
     "disabled":false,
     "default":false,
     "sortable":true,
-    "type":"number",
+    "type":"title",
     "width":"25%",
     "minWidth":"",
-    "editable":false
+    "editable":true
 },
 {
     "name":"content3",

apimocks/dropdown/items.json

@@ -1,4 +1,4 @@
-{"total": 3, "items": [
+{"total": 3, "dropdownItems": [
     {
         "id": "1",
         "name": "Private"

apimocks/dropzone/uploaded.json

@@ -1,9 +1,15 @@
-{"total": 1, "_embedded": {
-    "media": [
-        {
-            "id": 1,
-            "name": "Picture 1",
-            "category": "products"
-        }
-    ]
-}}
+{
+  "id": 6,
+  "size": 595834,
+  "mimeType": "image\/jpeg",
+  "title": "donald-duck-susse",
+  "name": "donald-duck-susse.jpg",
+  "thumbnails": {
+    "170x170": "http:\/\/www.bilderfotos.com\/data\/media\/6\/donald-duck-susse.jpg",
+    "200x200": "http:\/\/www.bilderfotos.com\/data\/media\/6\/donald-duck-susse.jpg",
+    "50x50": "http:\/\/www.bilderfotos.com\/data\/media\/6\/donald-duck-susse.jpg",
+    "150x100": "http:\/\/www.bilderfotos.com\/data\/media\/6\/donald-duck-susse.jpg",
+    "640x480": "http:\/\/www.bilderfotos.com\/data\/media\/6\/donald-duck-susse.jpg"
+  },
+  "url": "\/media\/6\/download\/handplant_regular.jpg?v=1"
+}

apimocks/navigation/items.json

@@ -1,5 +1,5 @@
 {
-    "title": "Sulu 2.0",
+    "title": "Sulu",
     "id": "1",
     "items": [
         {

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "husky",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "main": "js/husky.js",
   "dependencies": {
     "backbone": "1.1.*",
@@ -15,7 +15,8 @@
     "dropzone": "4.0.*",
     "jquery-minicolors": "~2.1.6",
     "bootstrap-datepicker": "~1.3.0",
-    "ckeditor": "4.4.7"
+    "ckeditor": "4.4.7",
+    "html.sortable": "~0.3.0"
   },
   "resolutions": {
     "jquery": "~1.10.x"