Merge branch 'develop'

massiveart · Apr 12, 2016 · b866981 · b866981
2 parents 81967da + 4bd963a
commit b866981
Show file tree

Hide file tree

Showing 50 changed files with 2,915 additions and 1,445 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # CHANGELOG for husky
 
+* dev-develop
+    * FEATURE     #632 Fixed wrong index of regex
+    * BUGFIX      #631 Fixed javascript error when clicking on column navigation options
+    * FEATURE     #630 Added overlay-loader
+    * BUGFIX      #629 Avoid having scientific representation of number in formatBytes method
+    * BUGFIX      #628 Fixed inheriting font from FontAwesome
+    * BUGFIX      #627 Fixed preselection filtering bug
+    * BUGFIX      #626 Added filtering of preselected items
+    * BUGFIX      #625 Improved regex for urls
+    * BUGFIX      #624 Fixed ui bugs in overlay, navigation and data-navigation
+    * BUGFIX      #623 Added missing value check to matrix component
+    * ENHANCEMENT #622 Added navigation divider for sections with no title
+    * ENHANCEMENT #620 Fixed gap between different containers and input-description
+    * ENHANCEMENT #621 Made badge usable outside of datagrid
+    * BUGFIX      #618 Fixed update of record with a different id property
+    * FEATURE     #619 Introduced info text for dropdown
+    * BUGFIX      #617 Fixed jquery text function with empty value
+    * FEATURE     #597 added additional callback for select and fixed css bugs
+    * BUGFIX      #616 Fixed label tick in firefox
+    * ENHANCEMENT #615 Introduced no-img-icon as function to use record dependent icons
+    * BUGFIX      #613 Fixed search-icon to prevent routing
+    * FEATURE     #610 Added save parameter for datagrid
+    * BUGFIX      #612 Fixed link style in white-boxes
+    * ENHANCEMENT #614 Added evaluate tab-conditions
+    * FEATURE     #608 Allows each row in the matrix component to have different values
+    * ENHANCEMENT #595 Added default label for is-native selects
+    * ENHANCEMENT #594 Changed style of warning label
+    * ENHANCEMENT #593 Changed toggler to only use data attribute
+    * FEATURE     #578 Adjusted design for multiple select
+    * FEATURE     #586 Enhanced table view
+
 * 0.18.6 (2016-03-07)
     * HOTFIX      #609 Fixed input back class overlapping
     * HOTFIX      #607 Fixed data-attribute id for auto-complete

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "husky",
-  "version": "0.18.6",
+  "version": "develop",
   "main": "js/husky.js",
   "dependencies": {
     "backbone": "1.1.*",

diff --git a/bower_components/husky-validation/dist/validation.js b/bower_components/husky-validation/dist/validation.js
diff --git a/bower_components/husky-validation/dist/validation.min.js b/bower_components/husky-validation/dist/validation.min.js
diff --git a/demos/input/script.js b/demos/input/script.js
@@ -1,7 +1,8 @@
 require.config({
     baseUrl: '../../',
     paths: {
-        "type/husky-input": "husky_components/input/input-type"
+        'type/husky-input': 'husky_components/input/input-type',
+        'services/husky/url-validator': 'husky_services/url-validator'
     }
 });
 

diff --git a/demos/label/index.html b/demos/label/index.html
@@ -45,7 +45,9 @@ <h1>Husky Label Demo</h1>
         <div class="grid-row">
             <div class="grid-col-6">
                 <div id="successLabel"></div>
+                <div id="warningLabelWithoutTitle"></div>
                 <div id="warningLabel"></div>
+                <div id="warningLabelLong"></div>
             </div>
         </div>
         <div class="grid-row">
@@ -101,6 +103,16 @@ <h1>Husky Label Demo</h1>
                     description: 'This is a neat success-label'
                 }
             },
+            {
+                name: 'label@husky',
+                options: {
+                    el: '#warningLabelWithoutTitle',
+                    type: 'WARNING',
+                    instanceName: 'warning',
+                    title: '',
+                    description: 'This is a neat warning-label without a title'
+                }
+            },
             {
                 name: 'label@husky',
                 options: {
@@ -110,6 +122,15 @@ <h1>Husky Label Demo</h1>
                     description: 'This is a neat warning-label'
                 }
             },
+            {
+                name: 'label@husky',
+                options: {
+                    el: '#warningLabelLong',
+                    type: 'WARNING',
+                    instanceName: 'warning',
+                    description: 'This is a neat warning-label<br/>including multiple lines'
+                }
+            },
             {
                 name: 'label@husky',
                 options: {

diff --git a/demos/matrix/index.html b/demos/matrix/index.html
@@ -15,22 +15,15 @@
     <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.min.css">
-    <style>
-        #container {
-            width: 800px;
-            margin-left: 300px;
-            margin-top: 100px;
-        }
-    </style>
 </head>
 <body>
-<div id="container">
+
+<div id="matrix">
 
     <button id="set-all">Set All</button>
     <button id="unset-all">Unset All</button>
 </div>
 
-
 <script src="../js/jquery.js"></script>
 <script src="../js/require.js"></script>
 <script src="../js/defaults.js"></script>
@@ -43,17 +36,18 @@
     require(['lib/husky'], function(Husky) {
         'use strict';
 
-        var app = Husky({ debug: { enable: true }}),
-                _ = app.sandbox.util._;
+        var app = Husky({debug: {enable: true}}),
+            _ = app.sandbox.util._;
 
         app.start().then(function() {
             app.logger.log('Aura started...');
 
+
             app.sandbox.start([
                 {
                     name: 'matrix@husky',
                     options: {
-                        el: '#container',
+                        el: '#matrix',
                         captions: {
                             all: 'Select all',
                             none: 'Select none',
@@ -65,20 +59,34 @@
                         values: {
                             vertical: ['sulu.assets.videos', 'sulu.assets.documents', 'sulu.assets.images'],
                             horizontal: [
-                                {value: 'value1', icon: 'plus'},
-                                {value: 'value2', icon: 'edit'},
-                                {value: 'value3', icon: 'search'},
-                                {value: 'value4', icon: 'times'},
-                                {value: 'value5', icon: 'gear'},
-                                {value: 'value6', icon: 'check'},
-                                {value: 'value7', icon: 'building'}
-                            ],
-                            titles: ['add', 'edit', 'search', 'remove', 'settings', 'circle-ok', 'building']
+                                [
+                                    {value: 'value1', icon: 'plus', title: 'add'},
+                                    {value: 'value2', icon: 'edit', title: 'edit'},
+                                    {value: 'value3', icon: 'search', title: 'search'},
+                                    {value: 'value4', icon: 'times', title: 'remove'},
+                                    {value: 'value5', icon: 'gear', title: 'settings'},
+                                    {value: 'value6', icon: 'check', title: 'circle-ok'},
+                                    {value: 'value7', icon: 'building', title: 'building'}
+                                ],
+                                [
+                                    {value: 'value2', icon: 'edit', title: 'edit'},
+                                    {value: 'value4', icon: 'times', title: 'remove'},
+                                    {value: 'value5', icon: 'gear', title: 'settings'},
+                                    {value: 'value7', icon: 'building', title: 'building'}
+                                ],
+                                [
+                                    {value: 'value1', icon: 'plus', title: 'add'},
+                                    {value: 'value2', icon: 'edit', title: 'edit'},
+                                    {value: 'value3', icon: 'search', title: 'search'},
+                                    {value: 'value4', icon: 'times', title: 'remove'},
+                                    {value: 'value5', icon: 'gear', title: 'settings'},
+                                ]
+                            ]
                         },
                         data: [
                             [true, false, true, false, false, false, false],
-                            [true, true, true, true, true, true, true],
-                            [false, true, true, false, true, false, true]
+                            [true, true, true, true],
+                            [false, true, true, false, true]
                         ]
                     }
                 }

diff --git a/demos/toggler/index.html b/demos/toggler/index.html
@@ -0,0 +1,53 @@
+<!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>Toggler</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.min.css">
+    <style>
+        body {
+            margin: 20px;
+            overflow: hidden;
+        }
+    </style>
+</head>
+<body>
+
+<h1>Standard Toggler</h1>
+<div data-aura-component="toggler@husky"></div>
+
+<script src="../js/jquery.js"></script>
+<script src="../js/require.js"></script>
+<script src="../js/defaults.js"></script>
+
+<script type="text/javascript">
+    require.config({
+        baseUrl: '../../'
+    });
+
+    require(['lib/husky'], function(Husky) {
+        'use strict';
+
+
+        var app = Husky({ debug: { enable: true }}),
+                _ = app.sandbox.util._;
+
+        app.start().then(function() {
+            app.logger.log('Aura started...');
+        });
+    });
+</script>
+
+</body>
+</html>