fix bootstrap dialog default button

r-kamath · r-kamath · commit 7d933f0f2a39 · 2015-12-14T23:53:11.000+05:30
diff --git a/zeppelin-web/src/app/app.controller.js b/zeppelin-web/src/app/app.controller.js
@@ -20,7 +20,7 @@ angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootSc
   var init = function() {
     $scope.asIframe = (($window.location.href.indexOf('asIframe') > -1) ? true : false);
   };
-  
+
   init();
 
   $rootScope.$on('setIframe', function(event, data) {
@@ -36,10 +36,13 @@ angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootSc
       event.preventDefault();
     }
   });
-  
+
   // Set The lookAndFeel to default on every page
   $rootScope.$on('$routeChangeStart', function(event, next, current) {
     $rootScope.$broadcast('setLookAndFeel', 'default');
   });
 
+  BootstrapDialog.defaultOptions.onshown = function() {
+    angular.element('#'+this.id).find('.btn:last').focus();
+  };
 });
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -115,7 +115,10 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
             angular.element('#' + n.id + '_paragraphColumn_main').scope().runParagraph(n.text);
           });
         }
-      }
+      },
+      closable: true,
+      closeByBackdrop: false,
+      closeByKeyboard: false,
     });
   };
 
@@ -314,11 +317,11 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
   $scope.$on('insertParagraph', function(event, paragraphId, position) {
     var newIndex = -1;
     for (var i=0; i<$scope.note.paragraphs.length; i++) {
-      if ( $scope.note.paragraphs[i].id === paragraphId ) {        
+      if ( $scope.note.paragraphs[i].id === paragraphId ) {
         //determine position of where to add new paragraph; default is below
-        if ( position === 'above' ) {         
+        if ( position === 'above' ) {
           newIndex = i;
-        } else {     
+        } else {
           newIndex = i+1;
         }
         break;
