added confirmation dialog for luedittable delete; added confirmation dialog helper; cleaned files

Gruntfile.js

@@ -11,7 +11,8 @@ module.exports = function(grunt) {
                     'dist/luticate-utils.min.js': [
                         'src/luticateutils.js',
                         'src/*.js',
-                        'src/modals/*.js'
+                        'src/modals/*.js',
+                        'src/directives/*.js'
                     ]
                 }
             }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "luticate-utils",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "authors": [
     "Robin THONI <robin@rthoni.com>"
   ],

src/modals/dialogclose.js → src/directives/dialogclose.js

@@ -8,7 +8,7 @@ angular.module('luticateUtils')
             return {
                 restrict: 'EA',
                 transclude: true,
-                templateUrl: '/luticateUtils/dialogclose.html',
+                templateUrl: '/luticateUtils/dialogclose-directive.html',
                 link: function link($scope, element, attrs) {
                     $scope.title = attrs.title;
 
@@ -25,7 +25,7 @@ angular.module('luticateUtils')
 
 angular.module("luticateUtils").run(["$templateCache", function($templateCache)
 {
-    $templateCache.put("/luticateUtils/dialogclose.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
+    $templateCache.put("/luticateUtils/dialogclose-directive.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
         '<div class="modal-header">{{ title }}</div>' +
         '<div class="modal-body" lu-busy="modal">' +
         '    <div class="form-group">' +

src/directives/dialogokcancel.js

@@ -0,0 +1,91 @@
+/**
+ * Created by robin on 11/2/15.
+ */
+
+(function () {
+    'use strict';
+
+    angular.module('luticateUtils')
+        .directive('dialogOkCancel', ['luticateDialogErrorHelper',
+            function (luticateDialogErrorHelper) {
+                return {
+                    restrict: 'EA',
+                    transclude: true,
+                    templateUrl: '/luticateUtils/dialogokcancel-directive.html',
+                    link: function link($scope, element, attrs) {
+                        $scope.title = attrs.title;
+                        $scope.model = {};
+                        $scope.pending = false;
+                        $scope.submitted = false;
+
+                        $scope.__submit = function()
+                        {
+                            $scope.submitted = true;
+                            if ($scope.form.$valid) {
+                                $scope.pending = true;
+                                $scope.promise = $scope.submitForm();
+                                if ($scope.promise)
+                                {
+                                    $scope.promise.then(function(data) {
+                                        if ($scope.onDone) {
+                                            $scope.onDone(data);
+                                        }
+                                        $scope.$close(data);
+                                        $scope.pending = false;
+                                    })
+                                        .catch(function(error)
+                                        {
+                                            if ($scope.onError) {
+                                                $scope.onError(error);
+                                            }
+                                            luticateDialogErrorHelper.errorDialog(error)
+                                                .result.then(function(data)
+                                                {
+                                                }, function(error2)
+                                                {
+                                                    $scope.$dismiss(error);
+                                                });
+                                            $scope.pending = false;
+                                        });
+                                }
+                                else {
+                                    $scope.$close();
+                                    $scope.pending = false;
+                                }
+                            }
+                        };
+
+                        $scope.__cancel = function()
+                        {
+                            if ($scope.onCanceled) {
+                                $scope.onCanceled();
+                            }
+                            $scope.$dismiss();
+                            $scope.pending = false;
+                        };
+                    }
+                };
+            }]);
+
+    angular.module("luticateUtils").run(["$templateCache", function($templateCache)
+    {
+        $templateCache.put("/luticateUtils/dialogokcancel-directive.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
+    '<form name="form" class="form-horizontal" ng-submit="__submit()">' +
+    '<div class="modal-header">{{ title }}</div>' +
+    '<div class="modal-body" lu-busy="modal">' +
+    '    <div class="form-group">' +
+    '    <ng-transclude></ng-transclude>' +
+    '    </div>' +
+    '    <div class="clearfix"></div>' +
+    /*'    <span class="error" ng-show="submitted">' +
+    '    <p class="error">{{ errorString }}</p>' +
+    '</span>' +*/
+    '</div>' +
+    '<div class="modal-footer">' +
+    '    <button type="button" class="btn btn-inverse" ng-click="__cancel()">Cancel</button>' +
+    '    <button type="submit" class="btn btn-primary" ng-enabled="!pending">OK</button>' +
+    '    </div>' +
+    '    </form>' +
+    '    </div>');
+    }]);
+})();

src/luedittable.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticateUtils')
-    .directive('luEditTable', ['dialogs', 'luticateDialogErrorHelper', 'luticateAuthCache',
-        function(dialogs, luticateDialogErrorHelper, luticateAuthCache) {
+    .directive('luEditTable', ['dialogs', 'luticateDialogErrorHelper', 'luticateAuthCache', 'luticateDialogOkCancelHelper',
+        function(dialogs, luticateDialogErrorHelper, luticateAuthCache, luticateDialogOkCancelHelper) {
             return {
                 restrict: 'E',
                 scope: {
@@ -101,6 +101,16 @@ angular.module('luticateUtils')
                         }
                     }
 
+                    $scope.askDeleteItems = function()
+                    {
+                        luticateDialogOkCancelHelper.okCancelDialog({
+                            title: "Delete items",
+                            text: "Do you really want to delete selected items?"
+                        }).result.then(function()
+                        {
+                            $scope.deleteItems();
+                        });
+                    };
 
                     $scope.deleteItems = function () {
                         if ($scope.tableOptions.checkedItems.length == 0) {
@@ -135,12 +145,12 @@ angular.module('luticateUtils').run(['$templateCache', function($templateCache)
     $templateCache.put('/luticate/lutable.html',
 '<lu-basic-table options="tableOptions"><lu-basic-table-filter><ng-transclude ng-transclude="lu-basic-table-filter"></ng-transclude></lu-basic-table-filter></lu-basic-table>' +
 '<div class="col-sm-12">' +
-'    <button class="btn btn-danger" type="button" ng-click="deleteItems()"' +
-'       ng-disabled="tableOptions.checkedItems.length == 0" ng-show="tableOptions.canDel()">' +
-'       <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete' +
+'    <button class="btn btn-danger" type="button" ng-click="askDeleteItems()"' +
+'        ng-disabled="tableOptions.checkedItems.length == 0" ng-show="tableOptions.canDel()">' +
+'        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete' +
 '    </button>' +
 '    <button class="btn btn-primary" type="button" ng-click="tableOptions.addItem()" ng-show="tableOptions.canAdd()">' +
-'       <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add' +
+'        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add' +
 '    </button>' +
 '</div>');
 }]);

src/modals/dialogerror.js

@@ -2,17 +2,60 @@
  * Created by robin on 11/3/15.
  */
 
-'use strict';
-
-angular.module('luticateUtils').
-    controller('luticateDialogError', ['$scope', 'data', '$state', 'luticateAuthCache',
-    function ($scope, data, $state, luticateAuthCache) {
-        $scope.message = data.message;
-        $scope.showLogin = data.data.Status == 401;
-        $scope.reconnect = function()
-        {
-            $scope.$dismiss();
-            luticateAuthCache.removeUser();
-            $state.go('login');
-        };
-    }]);
+(function () {
+    'use strict';
+
+    angular.module('luticateUtils').
+        controller('luticateDialogError', ['$scope', 'data', '$state', 'luticateAuthCache',
+        function ($scope, data, $state, luticateAuthCache) {
+            $scope.message = data.message;
+            $scope.showLogin = data.data.Status == 401;
+            $scope.reconnect = function()
+            {
+                $scope.$dismiss();
+                luticateAuthCache.removeUser();
+                $state.go('login');
+            };
+        }]);
+
+    angular.module('luticateUtils')
+        .factory('luticateDialogErrorHelper', ['dialogs', function (dialogs) {
+
+            var luticateDialogErrorHelper = {};
+
+            luticateDialogErrorHelper.errorMessage = function(data)
+            {
+                var message = data.Data;
+                message += " (HTTP code: " + data.Status + ")";
+                /*var status = 'Common.Status.HttpStatus.' + data.status;
+                 var statusText = tr(status);
+                 if (status != statusText)
+                 message += " : " + statusText;*/
+                return message;
+            };
+
+            luticateDialogErrorHelper.errorDialog = function(data)
+            {
+                var message = luticateDialogErrorHelper.errorMessage(data);
+                return dialogs.create('/luticateUtils/dialogerror.html', 'luticateDialogError', {message: message, data: data}, {});
+            };
+
+            return luticateDialogErrorHelper;
+        }]);
+
+    angular.module("luticateUtils").run(["$templateCache", function($templateCache)
+    {
+        $templateCache.put("/luticateUtils/dialogerror.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
+            '            <div class="modal-header">Error</div>' +
+            '        <div class="modal-body">' +
+            '        <div class="form-group">{{ message }}</div>' +
+            '        <div class="clearfix"></div>' +
+            '        </div>' +
+            '        <div class="modal-footer">' +
+            '        <button type="submit" class="btn btn-inverse" ng-click="$close()" ng-show="!showLogin">Close</button>' +
+            '        <button type="submit" class="btn btn-inverse" ng-click="$close()" ng-show="showLogin">Cancel</button>' +
+            '        <button type="button" class="btn btn-primary" ng-click="reconnect()" ng-show="showLogin">Login</button>' +
+            '        </div>' +
+            '        </div>')
+    }]);
+})();

src/modals/dialogerrorhelper.js

@@ -1,47 +0,0 @@
-/**
- * Created by robin on 11/3/15.
- */
-
-(function () {
-    'use strict';
-    angular.module('luticateUtils')
-        .factory('luticateDialogErrorHelper', ['dialogs', function (dialogs) {
-
-            var luticateDialogErrorHelper = {};
-
-            luticateDialogErrorHelper.errorMessage = function(data)
-            {
-                var message = data.Data;
-                message += " (HTTP code: " + data.Status + ")";
-                /*var status = 'Common.Status.HttpStatus.' + data.status;
-                var statusText = tr(status);
-                if (status != statusText)
-                    message += " : " + statusText;*/
-                return message;
-            };
-
-            luticateDialogErrorHelper.errorDialog = function(data)
-            {
-                var message = luticateDialogErrorHelper.errorMessage(data);
-                return dialogs.create('/luticateUtils/dialogerror.html', 'luticateDialogError', {message: message, data: data}, {});
-            };
-
-            return luticateDialogErrorHelper;
-        }]);
-})();
-
-angular.module("luticateUtils").run(["$templateCache", function($templateCache)
-{
-    $templateCache.put("/luticateUtils/dialogerror.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
-        '            <div class="modal-header">Error</div>' +
-        '        <div class="modal-body">' +
-        '        <div class="form-group">{{ message }}</div>' +
-        '        <div class="clearfix"></div>' +
-        '        </div>' +
-        '        <div class="modal-footer">' +
-        '        <button type="submit" class="btn btn-inverse" ng-click="$close()" ng-show="!showLogin">Close</button>' +
-        '        <button type="submit" class="btn btn-inverse" ng-click="$close()" ng-show="showLogin">Cancel</button>' +
-        '        <button type="button" class="btn btn-primary" ng-click="reconnect()" ng-show="showLogin">Login</button>' +
-        '        </div>' +
-        '        </div>')
-}]);

src/modals/dialogokcancel.js

@@ -1,88 +1,40 @@
 /**
- * Created by robin on 11/2/15.
+ * Created by robin on 11/3/15.
  */
 
 
-angular.module('luticateUtils')
-    .directive('dialogOkCancel', ['luticateDialogErrorHelper',
-        function (luticateDialogErrorHelper) {
-            return {
-                restrict: 'EA',
-                transclude: true,
-                templateUrl: '/luticateUtils/dialogokcancel.html',
-                link: function link($scope, element, attrs) {
-                    $scope.title = attrs.title;
-                    $scope.model = {};
-                    $scope.pending = false;
-                    $scope.submitted = false;
+(function () {
+    'use strict';
 
-                    $scope.__submit = function()
-                    {
-                        $scope.submitted = true;
-                        if ($scope.form.$valid) {
-                            $scope.pending = true;
-                            $scope.promise = $scope.submitForm();
-                            if ($scope.promise)
-                            {
-                                $scope.promise.then(function(data) {
-                                    if ($scope.onDone) {
-                                        $scope.onDone(data);
-                                    }
-                                    $scope.$close(data);
-                                    $scope.pending = false;
-                                })
-                                    .catch(function(error)
-                                    {
-                                        if ($scope.onError) {
-                                            $scope.onError(error);
-                                        }
-                                        luticateDialogErrorHelper.errorDialog(error)
-                                            .result.then(function(data)
-                                            {
-                                            }, function(error2)
-                                            {
-                                                $scope.$dismiss(error);
-                                            });
-                                        $scope.pending = false;
-                                    });
-                            }
-                            else {
-                                $scope.$close();
-                                $scope.pending = false;
-                            }
-                        }
-                    };
+    angular.module('luticateUtils').
+    controller('luticateDialogOkCancel', ['$scope', 'data',
+        function ($scope, data) {
+            $scope.text = data.text;
+            $scope.title = data.title;
+            $scope.submitForm = function()
+            {
+                $scope.$close();
+            };
+        }]);
+
+    angular.module('luticateUtils')
+        .factory('luticateDialogOkCancelHelper', ['dialogs', function (dialogs) {
 
-                    $scope.__cancel = function()
-                    {
-                        if ($scope.onCanceled) {
-                            $scope.onCanceled();
-                        }
-                        $scope.$dismiss();
-                        $scope.pending = false;
-                    };
-                }
+            var luticateDialogOkCancelHelper = {};
+
+            luticateDialogOkCancelHelper.okCancelDialog = function(data)
+            {
+                return dialogs.create('/luticateUtils/dialogokcancel-dialog.html', 'luticateDialogOkCancel', data, {});
             };
+
+            return luticateDialogOkCancelHelper;
         }]);
 
-angular.module("luticateUtils").run(["$templateCache", function($templateCache)
-{
-    $templateCache.put("/luticateUtils/dialogokcancel.html", '<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">' +
-'<form name="form" class="form-horizontal" ng-submit="__submit()">' +
-'<div class="modal-header">{{ title }}</div>' +
-'<div class="modal-body" lu-busy="modal">' +
-'    <div class="form-group">' +
-'    <ng-transclude></ng-transclude>' +
-'    </div>' +
-'    <div class="clearfix"></div>' +
-/*'    <span class="error" ng-show="submitted">' +
-'    <p class="error">{{ errorString }}</p>' +
-'</span>' +*/
-'</div>' +
-'<div class="modal-footer">' +
-'    <button type="button" class="btn btn-inverse" ng-click="__cancel()">Cancel</button>' +
-'    <button type="submit" class="btn btn-primary" ng-enabled="!pending">OK</button>' +
-'    </div>' +
-'    </form>' +
-'    </div>')
-}]);
+    angular.module("luticateUtils").run(["$templateCache", function($templateCache)
+    {
+        $templateCache.put("/luticateUtils/dialogokcancel-dialog.html",
+            '<dialog-ok-cancel title="{{ title }}">' +
+            '    <div class="modal-body">{{ text }}</div>' +
+            '</dialog-ok-cancel>')
+    }]);
+})();