zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cornead...@apache.org
Subject incubator-zeppelin git commit: Fix edit note name bug
Date Mon, 21 Dec 2015 00:48:43 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 0194d389a -> f0d3c3f0e


Fix edit note name bug

### What is this PR for?
hide and show of the editor is not functioning properly

### What type of PR is it?
Bug fix

### Is there a relevant Jira issue?
no

### How should this be tested?
Click on on the note name, change the text and enter or focus out to save the new name. Hit
Esc for cancel

Author: Renjith Kamath <renjith.kamath@gmail.com>

Closes #539 from r-kamath/noteNameEditBugFix and squashes the following commits:

8d1ad4b [Renjith Kamath] fix edit note name enter/blur fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f0d3c3f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f0d3c3f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f0d3c3f0

Branch: refs/heads/master
Commit: f0d3c3f0e3e898b5625a1d3745a701271905c22c
Parents: 0194d38
Author: Renjith Kamath <renjith.kamath@gmail.com>
Authored: Wed Dec 16 12:01:17 2015 +0530
Committer: Damien CORNEAU <corneadoug@gmail.com>
Committed: Mon Dec 21 09:48:31 2015 +0900

----------------------------------------------------------------------
 zeppelin-web/src/app/notebook/notebook-actionBar.html | 2 +-
 zeppelin-web/src/app/notebook/notebook.controller.js  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f0d3c3f0/zeppelin-web/src/app/notebook/notebook-actionBar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index 3402735..dc99e1d 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -14,7 +14,7 @@ limitations under the License.
 <div class="noteAction" ng-show="note.id && !paragraphUrl">
   <h3>
     <input type="text" pu-elastic-input class="form-control2" placeholder="{{note.name
|| 'Note ' + note.id}}" style="min-width: 200px; max-width: 600px;"
-           ng-show="showEditor" ng-model="note.name" ng-blur="sendNewName()" ng-enter="sendNewName()"
ng-escape="note.name = oldName; showEditor = false" focus-if="showEditor" />
+           ng-show="showEditor" ng-model="note.name" ng-blur="sendNewName();showEditor =
false;" ng-enter="sendNewName();showEditor = false;" ng-escape="note.name = oldName; showEditor
= false" focus-if="showEditor" />
     <p class="form-control-static2" ng-click="showEditor = true; oldName = note.name"
ng-show="!showEditor">{{note.name || 'Note ' + note.id}}</p>
     <span class="labelBtn btn-group">
       <button type="button"

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f0d3c3f0/zeppelin-web/src/app/notebook/notebook.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index 1a4cff8..9533dd1 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -236,7 +236,6 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope,
$ro
 
   /** Update the note name */
   $scope.sendNewName = function() {
-    $scope.showEditor = false;
     if ($scope.note.name) {
       websocketMsgSrv.updateNotebook($scope.note.id, $scope.note.name, $scope.note.config);
     }


Mime
View raw message