branch develop updated (6748663 -> 06c6c34)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 6748663 upgrade datepicker-popup to uib-datepicker-popup new 06c6c34 upgrade modal component The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 06c6c34d611c732d4723ef325f263c442481b94b Author: Yannick Martel <martel@©odelutin.com> Date: Tue Dec 29 09:43:58 2015 +0100 upgrade modal component Summary of changes: .../src/main/webapp/js/coselmar-controllers.js | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 06c6c34d611c732d4723ef325f263c442481b94b Author: Yannick Martel <martel@©odelutin.com> Date: Tue Dec 29 09:43:58 2015 +0100 upgrade modal component --- .../src/main/webapp/js/coselmar-controllers.js | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index a5b0fc2..5ef7151 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1015,8 +1015,8 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara }]); // Controller for Question View -coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParams', '$location', '$modal', 'notify', 'questionsService', 'errorService', - function($scope, $route, $routeParams, $location, $modal, notify, questionsService, errorService){ +coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParams', '$location', '$uibModal', 'notify', 'questionsService', 'errorService', + function($scope, $route, $routeParams, $location, $uibModal, notify, questionsService, errorService){ $scope.editSession = $routeParams.edit ? $routeParams.edit : false; $scope.isCurrentParticipant = false; @@ -1311,7 +1311,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam // Modals part for documents $scope.modalSearchDocuments = function (documentList) { - var modalInstance = $modal.open({ + var modalInstance = $uibModal.open({ templateUrl: 'views/documents/modalDocumentSearch.html', controller: 'ModalSearchDocumentsCtrl', size: 'lg' @@ -1332,7 +1332,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam $scope.modalCreateDocument = function (documentList) { - var modalInstance = $modal.open({ + var modalInstance = $uibModal.open({ templateUrl: 'views/documents/modalDocumentEdit.html', controller: 'ModalCreateDocumentsCtrl', size: 'lg' @@ -1361,7 +1361,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam // Modals part for parent questions $scope.modalSearchParents = function () { - var modalInstance = $modal.open({ + var modalInstance = $uibModal.open({ templateUrl: 'views/questions/modalQuestionSearch.html', controller: 'ModalSearchQuestionsCtrl', size: 'lg', @@ -1411,7 +1411,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam }]); -coselmarControllers.controller('ModalSearchDocumentsCtrl', function ($scope, $modalInstance, documentService, errorService) { +coselmarControllers.controller('ModalSearchDocumentsCtrl', function ($scope, $uibModalInstance, documentService, errorService) { $scope.searchKeywords = []; @@ -1426,16 +1426,16 @@ coselmarControllers.controller('ModalSearchDocumentsCtrl', function ($scope, $mo }; $scope.select = function (document) { - $modalInstance.close(document); + $uibModalInstance.close(document); }; $scope.cancel = function () { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); }; }); -coselmarControllers.controller('ModalSearchQuestionsCtrl', function ($scope, $modalInstance, currentQuestionId, questionsService, errorService) { +coselmarControllers.controller('ModalSearchQuestionsCtrl', function ($scope, $uibModalInstance, currentQuestionId, questionsService, errorService) { $scope.searchKeywords = []; $scope.searchOptions = { 'type' : 'PERIODICAL_PUBLICATION', 'privacy' : '', 'status' : '', 'fullTextSearch' : []}; @@ -1454,16 +1454,16 @@ coselmarControllers.controller('ModalSearchQuestionsCtrl', function ($scope, $mo }; $scope.select = function (question) { - $modalInstance.close(question); + $uibModalInstance.close(question); }; $scope.cancel = function () { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); }; }); -coselmarControllers.controller('ModalCreateDocumentsCtrl', function ($scope, $modalInstance, documentService, errorService) { +coselmarControllers.controller('ModalCreateDocumentsCtrl', function ($scope, $uibModalInstance, documentService, errorService) { $scope.document = {'privacy': 'PUBLIC', 'keywords' : []}; $scope.upload = {}; @@ -1514,10 +1514,10 @@ coselmarControllers.controller('ModalCreateDocumentsCtrl', function ($scope, $mo if ($scope.upload.file) { var documentId = document.id; documentService.saveDocumentFile(documentId, $scope.upload.file, function() { - $modalInstance.close(document); + $uibModalInstance.close(document); }); } else { - $modalInstance.close(document); + $uibModalInstance.close(document); } }, errorService.defaultFailOnCall); } else { @@ -1526,7 +1526,7 @@ coselmarControllers.controller('ModalCreateDocumentsCtrl', function ($scope, $mo }; $scope.cancel = function () { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); }; }); @@ -1687,15 +1687,15 @@ coselmarControllers.filter('propsFilter', function() { * * Usage: Add attributes: ng-confirm-message="Are you sure"? ng-confirm-click="riskyAction()" */ -coselmarControllers.directive('ngConfirmClick', ['$modal', function($modal) { +coselmarControllers.directive('ngConfirmClick', ['$uibModal', function($uibModal) { - var ModalInstanceCtrl = function($scope, $modalInstance) { + var ModalInstanceCtrl = function($scope, $uibModalInstance) { $scope.ok = function() { - $modalInstance.close(); + $uibModalInstance.close(); }; $scope.cancel = function() { - $modalInstance.dismiss('cancel'); + $uibModalInstance.dismiss('cancel'); }; }; @@ -1713,7 +1713,7 @@ coselmarControllers.directive('ngConfirmClick', ['$modal', function($modal) { modalHtml += '<div class="modal-body"> {{\'' + message + '\' | translate}}</div>'; modalHtml += '<div class="modal-footer"><button class="btn btn-action btn-success float-right" ng-click="ok()">OK</button><button class="btn btn-action btn-disable" ng-click="cancel()">{{ \'common.button.cancel\' | translate }}</button></div>'; - var modalInstance = $modal.open({ + var modalInstance = $uibModal.open({ template: modalHtml, controller: ModalInstanceCtrl }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm