Merge remote-tracking branch 'remotes/origin/master' into ontos-ldiw-acc

Author: taleksashina

src/main/webapp/js/workbench/extraction-and-loading/d2rq-mapping-controller.js

@@ -133,11 +133,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshMappingGroups().then(function(response) {
-                    $('#modalMappingGroup').modal('hide');
+                    close('#modalMappingGroup');
                     adding = false;
                 });
             }, function(response) {
-                $('#modalMappingGroup').modal('hide');
+                close('#modalMappingGroup');
                 flash.error = ServerErrorResponse.getMessage(response.status);
             });
         });
@@ -694,11 +694,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                     headers: {"Content-Type":"application/json; charset=utf-8"}
                 }).then(function(response) {
                     $scope.refreshMappingGroups().then(function(response) {
-                        $('#modalMapping').modal('hide');
+                        close('#modalMapping');
                         adding = false;
                     });
                 }, function(response) {
-                    $('#modalMapping').modal('hide');
+                    close('#modalMapping');
                     flash.error = ServerErrorResponse.getMessage(response.status);
                 });
             });
@@ -711,11 +711,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshMappingGroups().then(function(response) {
-                    $('#modalMapping').modal('hide');
+                    close('#modalMapping');
                     adding = false;
                 });
             }, function(response) {
-                $('#modalMapping').modal('hide');
+                close('#modalMapping');
                 flash.error = ServerErrorResponse.getMessage(response.status);
             });
         }

src/main/webapp/js/workbench/extraction-and-loading/d2rq-mapping.html

@@ -41,7 +41,7 @@ <h5 class="modal-title green bold" data-i18n="_mapping-group_"></h5>
                 </div>
                 <div class="modal-footer">
                     <button type="submit" class="btn-sm btn-primary" ng-click="addMappingGroup();" ng-disabled="mappingGroupForm.$invalid || isAdding()" data-i18n="_add_"></button>
-                    <button type="button" class="btn-sm btn-default" data-dismiss="modal" data-i18n="_cancel_"></button>
+                    <button type="button" class="btn-sm btn-default" ng-click="close('#modalMappingGroup')" data-i18n="_cancel_"></button>
                 </div>
             </div>
         </form>
@@ -224,7 +224,7 @@ <h5 class="modal-title green bold" data-i18n="{{modaltitle}}"></h5>
 
                 <div class="modal-footer">
                     <button type="submit" class="btn-sm btn-primary" ng-click="save();" ng-disabled="mappingForm.$invalid || isAdding()" data-i18n="_save_"></button>
-                    <button type="button" class="btn-sm btn-default" data-dismiss="modal" data-i18n="_cancel_"></button>
+                    <button type="button" class="btn-sm btn-default" ng-click="close('#modalMapping')" data-i18n="_cancel_"></button>
                 </div>
             </div>
         </form>

src/main/webapp/js/workbench/extraction-and-loading/d2rq-task-controller.js

@@ -105,12 +105,12 @@ var D2RQTaskCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Accou
                     headers: {"Content-Type":"application/json; charset=utf-8"}
                 }).then(function(response) {
                     $scope.refreshTasks().then(function(response) {
-                        $('#modalTask').modal('hide');
+                        close('#modalTask');
                         adding = false;
                     });
                 }, function(response) {
                     flash.error = ServerErrorResponse.getMessage(response.status);
-                    $('#modalTask').modal('hide');
+                    close('#modalTask');
                 });
             });
     };

src/main/webapp/js/workbench/extraction-and-loading/d2rq-task.html

@@ -41,7 +41,7 @@ <h5 class="modal-title green bold" data-i18n="_new-task_"></h5>
                 </div>
                 <div class="modal-footer">
                     <button type="submit" class="btn-sm btn-primary" ng-click="add();" ng-disabled="taskForm.$invalid || isAdding()" data-i18n="_add_"></button>
-                    <button type="button" class="btn-sm btn-default" data-dismiss="modal" data-i18n="_cancel_"></button>
+                    <button type="button" class="btn-sm btn-default" ng-click="close('#modalTask')" data-i18n="_cancel_"></button>
                 </div>
             </div>
         </form>

src/main/webapp/js/workbench/manual-revision-and-authoring/ontology-controller.js

@@ -60,7 +60,7 @@ var OntologyCtrl = function($scope, $http, flash, ServerErrorResponse, AccountSe
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshOntologies();
-                $('#modalOntology').modal('hide');
+                close('#modalOntology');
             }, function(response) {
                 flash.error = ServerErrorResponse.getMessage(response.status);
                 $scope.refreshOntologies();
@@ -72,7 +72,7 @@ var OntologyCtrl = function($scope, $http, flash, ServerErrorResponse, AccountSe
                 data: {user: AccountService.getUsername()} //todo unauthorized user
             }).then(function(response) {
                 $scope.refreshOntologies();
-                $('#modalOntology').modal('hide');
+                close('#modalOntology');
             }, function(response) {
                 flash.error = ServerErrorResponse.getMessage(response.status);
                 $scope.refreshOntologies();