Merge branch 'develop'

massiveart · Oct 6, 2016 · 41f10cc · 41f10cc
2 parents 0314e1b + 5ea72a1
commit 41f10cc
Show file tree

Hide file tree

Showing 48 changed files with 2,889 additions and 1,330 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # CHANGELOG for husky
 
+* dev-develop
+    * FEATURE     #737 Added possibility to define overlay spacing for each slide
+    * BUGFIX      #738 Removed action icon in datagrid if no icon is defined
+    * ENHANCEMENT #735 Added maxHeight options to toolbar dropdownOptions
+    * BUGFIX      #722 Fixed create hover button for ghost pages and made it optional
+    * FEATURE     #733 Created addImage functionality in dropzone
+    * ENHANCEMENT #723 Added description class to itembox and made content take up the whole width
+    * FEATURE     #714 Tabs and language Changer are now in a new section -> language Changer can be used without Tabs.
+    * BUGFIX      #729 Update parent checkbox style when removing child in table-view datagrid-decorator
+    * BUGFIX      #729 Remove children rows on parent deletion in table-view datagrid-decorator
+    * ENHANCEMENT #731 Added expandIds-option to the datagrid component
+    * ENHANCEMENT #721 Improved cropping in tiles view and fixed dropzone issue when destroying
+    * ENHANCEMENT #715 Display effective limit in dropdown-pagination decorator
+    * ENHANCEMENT #715 Replace expand-icon with loader when loading children in datagrid
+    * ENHANCEMENT #715 Append currently selected items to request when loading data in datagrid
+    * BUGFIX      #707 Added translations to titles in matrix
+    * BUGFIX      #718 Made infinite scroll pagination add all records at once if possible
+    * ENHANCEMENT #716 Made the reset to the "show all" only happen, when the datagrid was in the "show selected" state before
+    * ENHANCEMENT #713 Removed overlay from dropzone and implemented own overlay-style for dropzone
+    * ENHANCEMENT #712 Removed data-navigation from navigation component
+    * FEATURE     #706 Created tiles view for datagrid
+    * FEATURE     #705 Added placeholder option to ckeditor component
+
 * 0.25.1 (2016-09-15)
     * HOTFIX      #726 Added singleMarkable option and get-marked event
     * HOTFIX      #725 Added locale to pagination request of data-navigation

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,19 @@
 # Upgrade
 
+## dev-develop
+
+### Lock and Unlocking the dropzone overlay
+
+The behaviour of the overlay in the dropzone got slightly changed.
+The changes introduced, forces the overlay to either be a popup
+or a "normal" dropzone directly rendered into the dom. This changes
+made locking and unlocking the dropzone popup obsolete.
+
+### Dropzone canceling upload when overlay closes
+
+The component option `cancelUploadOnOverlayClick` got renamed to
+`cancelUploadOnOverlayClose`.
+
 ## 0.24.0
 
 ### DataNavigation locale

diff --git a/apimocker_config.json b/apimocker_config.json
@@ -69,6 +69,10 @@
             "verbs": ["GET"],
             "mockFile": "datagrid/fields.json"
         },
+        "admin/api/datagrid/tiles": {
+            "verbs": ["GET"],
+            "mockFile": "datagrid/tiles.json"
+        },
 
         "admin/api/autocomplete": {
             "verbs": ["GET"],

diff --git a/apimocks/datagrid/tiles.json b/apimocks/datagrid/tiles.json
@@ -0,0 +1,84 @@
+{
+    "_links": {
+        "self": {
+            "href": "http://husky.lo:7878/admin/api/datagrid/tiles"
+        }
+    },
+    "_embedded": {
+        "items": [
+            {
+                "id": "1",
+                "title": "Folder title 1",
+                "elementsCount": 100
+            },
+            {
+                "id": "2",
+                "title": "Folder title 2",
+                "elementsCount": 120
+            },
+            {
+                "id": "3",
+                "title": "Folder title 3",
+                "elementsCount": 130
+            },
+            {
+                "id": "4",
+                "title": "Folder title 4",
+                "elementsCount": 140
+            },
+            {
+                "id": "5",
+                "title": "Folder title 5",
+                "elementsCount": 150
+            },
+            {
+                "id": "6",
+                "title": "Folder title 6",
+                "elementsCount": 160
+            },
+            {
+                "id": "7",
+                "title": "Folder title 7",
+                "elementsCount": 170
+            },
+            {
+                "id": "8",
+                "title": "Folder title 8 with a very very long title",
+                "elementsCount": 180
+            },
+            {
+                "id": "9",
+                "title": "Folder title 9 with an even longer title. This one is really long.",
+                "elementsCount": 190
+            },
+            {
+                "id": "10",
+                "title": "Folder title 10",
+                "elementsCount": 200
+            },
+            {
+                "id": "11",
+                "title": "Folder title 11",
+                "elementsCount": 210
+            },
+            {
+                "id": "12",
+                "title": "Folder title 12",
+                "elementsCount": 220
+            },
+            {
+                "id": "13",
+                "title": "Foldertitle12hasatitlewhichisoneword.",
+                "elementsCount": 230
+            },
+            {
+                "id": "14",
+                "title": "Foldertitle14whichisjustonewordandveryveryverylongsoithastobecropped.",
+                "elementsCount": 230
+            }
+        ]
+    },
+    "total": 13,
+    "pages": 1,
+    "page": 1
+}
diff --git a/apimocks/navigation/items.json b/apimocks/navigation/items.json
@@ -39,9 +39,7 @@
                         {
                             "title": "Collections",
                             "id": "7",
-                            "dataNavigation": {
-                                "url": "http://husky.lo:7878/admin/api/collections"
-                            }
+                            "action": "media/collections"
                         }
                     ]
                 },

diff --git a/demos/datagrid/index.html b/demos/datagrid/index.html
@@ -68,6 +68,8 @@ <h2 class="divider m-top-30">Children datagrid - (children loaded at beginning)<
 
             <h2 class="divider m-top-30">Datagrid as assignment component</h2>
             <div id="get-from-data" class="btn action fit m-bottom-30">Get selected cateogries from dom</div>
+            <div id="remove-parent" class="btn action fit m-bottom-30">Remove second parent</div>
+            <div id="remove-child" class="btn action fit m-bottom-30">Remove grandchild</div>
             <div id="assignment-datagrid"></div>
 
             <h2 class="divider m-top-30">Empty datagrid</h2>

diff --git a/demos/datagrid/script.js b/demos/datagrid/script.js
@@ -514,6 +514,14 @@ require(['lib/husky'], function(Husky) {
             app.sandbox.emit('husky.datagrid.url.update', {search: null, content1: "fdsa"});
         });
 
+        $('#remove-parent').on('click', function() {
+            app.sandbox.emit('husky.datagrid.assignment-datagrid.record.remove', 8);
+        });
+
+        $('#remove-child').on('click', function() {
+            app.sandbox.emit('husky.datagrid.assignment-datagrid.record.remove', 7);
+        });
+
         app.sandbox.on('husky.datagrid.row.removed', function(item) {
             app.logger.log('remove: ' + item);
         });

diff --git a/demos/datagrid/tiles/index.html b/demos/datagrid/tiles/index.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Datagrid demo</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width">
+    <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
+    <link rel="stylesheet" href="../../../dist/husky.css">
+
+    <style type="text/css">
+        #content {
+            max-width: 1200px;
+            margin: 0 0;
+            padding: 0 50px;
+        }
+        h1 {
+            padding: 20px 0 30px;
+        }
+        body {
+            overflow: auto;
+        }
+    </style>
+</head>
+<body>
+<div class="page">
+    <div id="content" class="grid">
+        <h1>Husky Datagrid Demo | Tiles View</h1>
+        <div id="datagrid" class="grid-row"></div>
+    </div>
+
+    <script src="../../../bower_components/jquery/jquery.js"></script>
+    <script src="../../../bower_components/requirejs/require.js"></script>
+    <script src="../../js/defaults.js"></script>
+    <script src="script.js"></script>
+</div>
+</body>
+</html>
diff --git a/demos/datagrid/tiles/script.js b/demos/datagrid/tiles/script.js
@@ -0,0 +1,42 @@
+require.config({
+    baseUrl: '../../../'
+});
+
+require(['lib/husky'], function(Husky) {
+    'use strict';
+
+    var app = new Husky({debug: {enable: true}});
+
+    app.start([{
+        name: 'datagrid@husky',
+        options: {
+            el: '#datagrid',
+            url: 'http://husky.lo:7878/admin/api/datagrid/tiles',
+            view: 'tiles',
+            viewOptions: {
+                tiles: {
+                    translations: {
+                        items: 'items',
+                        addNew: 'Add folder'
+                    }
+                }
+            },
+            pagination: false,
+            actionCallback: function(id, record) {
+                app.logger.log('Tile with the id ' + id + ' was clicked', record);
+            },
+            matchings: [
+                {
+                    name: 'id'
+                },
+                {
+                    name: 'title'
+                },
+                {
+                    name: 'elementsCount',
+                    type: 'count'
+                }
+            ]
+        }
+    }]);
+});
diff --git a/demos/dropzone/index.html b/demos/dropzone/index.html
@@ -35,6 +35,7 @@ <h1>Husky dropzone demo</h1>
                  data-aura-url="http://husky.lo:7878/admin/api/dropzone"
                  data-aura-instance-name="pictures"
                  data-aura-show-overlay="false"></div>
+            <button id="add-image">Add a nice image</button>
         </div>
     </div>
 
@@ -75,6 +76,18 @@ <h2>Overlay dropzone (image-change over event-listener)</h2>
             </div>
         </div>
     </div>
+
+    <div class="grid-row">
+        <div class="grid-col-6">
+            <div id="popupDropzone"
+                 data-aura-component="dropzone@husky"
+                 data-aura-description-key="Or click to add"
+                 data-aura-title-key="Drag and drop assets here to upload"
+                 data-aura-url="http://husky.lo:7878/admin/api/dropzone"
+                 data-aura-instance-name="popup"
+                 data-aura-show-overlay="true"></div>
+        </div>
+    </div>
 </div>
 
 
@@ -140,6 +153,10 @@ <h2>Overlay dropzone (image-change over event-listener)</h2>
     $('#unlock').on('click', function() {
        app.sandbox.emit('husky.dropzone.pictures.unlock-popup');
     });
+
+    $('#add-image').on('click', function() {
+        app.sandbox.emit('husky.dropzone.pictures.add-image', 'http://i.imgur.com/ATA1Mip.jpg');
+    })
 });
 </script>
 

diff --git a/demos/navigation/index.html b/demos/navigation/index.html
@@ -49,10 +49,7 @@
 
 <script>
     require.config({
-        baseUrl: '../../',
-        paths: {
-            "data-navigation": "husky_components/data-navigation"
-        }
+        baseUrl: '../../'
     });
 
     require(['lib/husky'], function(Husky) {

diff --git a/demos/overlay/index.html b/demos/overlay/index.html
@@ -81,6 +81,10 @@
                 <div class="grid-col-1">&nbsp;</div>
                 <div class="btn pointer grid-col-3 align-center" id="slides">Show me an overlay slides</div>
             </div>
+            <div class="grid-row m-top-20">
+                <div class="grid-col-1">&nbsp;</div>
+                <div class="btn pointer grid-col-3 align-center" id="slidesWithSpacings">Show me an overlay slides with different spacings</div>
+            </div>
             <div class="grid-row m-top-20">
                 <div class="grid-col-1">&nbsp;</div>
                 <div class="btn pointer grid-col-3 align-center" id="muchContent">This is an overlay with lots of content</div>
@@ -105,6 +109,7 @@
         <div id="overlay-skin-responsive"></div>
         <div id="insertOverlayHere"></div>
         <div id="overlaySlides"></div>
+        <div id="overlaySlidesWithSpacings"></div>
         <script src="../js/jquery.js"></script>
 
         <script src="../js/require.js"></script>
@@ -193,6 +198,31 @@
                             ]
                         }
                     },
+                    {
+                        name: 'overlay@husky',
+                        options: {
+                            el: '#overlaySlidesWithSpacings',
+                            triggerEl: '#slidesWithSpacings',
+                            instanceName: 'slidesWithSpacing',
+                            slides: [
+                                {
+                                    title: 'Slide 1',
+                                    data: [
+                                        '<div>Test with spacing</div>',
+                                        '<span class="pointer" id="slideWithSpacingRight">Click to slide right</span>'
+                                    ].join('')
+                                },
+                                {
+                                    title: 'Slide 2',
+                                    data: [
+                                        '<div>Test without spacing</div>',
+                                        '<span class="pointer" id="slideWithSpacingLeft">Click to slide left</span>',
+                                    ].join(''),
+                                    contentSpacing: false
+                                }
+                            ]
+                        }
+                    },
                     {
                         name: 'overlay@husky',
                         options: {
@@ -286,6 +316,7 @@
                                 {title: 'scrollable', data: '<h2>Scrollable</h2>'},
                                 {title: 'last-tab', data: '<h2>last tab</h2>'}
                             ],
+                            panelContent: '<div class="btn action">Very long text in a button.</div>',
                             languageChanger: {
                                 locales: ['EN', 'DE', 'ES'],
                                 preSelected: 'DE'
@@ -378,6 +409,14 @@
                         app.sandbox.emit('husky.overlay.slides.slide-right');
                     });
 
+                    $('body').on('click', '#slideWithSpacingRight', function() {
+                        app.sandbox.emit('husky.overlay.slidesWithSpacing.slide-right');
+                    });
+
+                    $('body').on('click', '#slideWithSpacingLeft', function() {
+                        app.sandbox.emit('husky.overlay.slidesWithSpacing.slide-left')
+                    });
+
                     app.sandbox.on('husky.overlay.deactivated.opened', function() {
                         setTimeout(function() {
                             app.sandbox.emit('husky.overlay.deactivated.okbutton.activate');

diff --git a/demos/select/index.html b/demos/select/index.html
@@ -388,7 +388,7 @@ <h1>Husky Select Demo</h1>
                             defaultLabel: 'Action select',
                             instanceName: 'actionSelect',
                             fixedLabel: true,
-                            style: 'action',
+                            skin: 'white-border',
                             icon: 'plus-circle',
                             repeatSelect: true,
                             noItemsCallback: function() {alert('no items. default callback called')}, // pass no data to the component to see this option in action