zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject incubator-zeppelin git commit: ZEPPELIN-188 Display of line numbers
Date Wed, 12 Aug 2015 04:22:43 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 4509efd27 -> 6d42af171


ZEPPELIN-188 Display of line numbers

Partial check-in with reference to : ZEPPELIN-188.
- Add an option under the paragraph settings to show/hide line numbers in ace editor

Since Ace editor is already integrated, with minor changes, this patch will get us line numbers.
Based on comments, would like to work on improving - syntax highlighting & auto-complete.

Thanks!

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

Closes #174 from r-kamath/master and squashes the following commits:

19aecb2 [Renjith Kamath] ZEPPELIN-188 Display of line numbers


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

Branch: refs/heads/master
Commit: 6d42af17153c14ef89f3471eda7f0af6e0aae022
Parents: 4509efd
Author: Renjith Kamath <renjith.kamath@gmail.com>
Authored: Fri Jul 31 20:36:57 2015 +0530
Committer: Lee moon soo <moon@apache.org>
Committed: Tue Aug 11 21:22:34 2015 -0700

----------------------------------------------------------------------
 .../notebook/paragraph/paragraph.controller.js  | 23 +++++++++++++++++++-
 .../src/app/notebook/paragraph/paragraph.html   |  8 +++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6d42af17/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 2c17cf6..217ea1b 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -196,6 +196,7 @@ angular.module('zeppelinWebApp')
       $scope.paragraph.errorMessage = data.paragraph.errorMessage;
       $scope.paragraph.jobName = data.paragraph.jobName;
       $scope.paragraph.title = data.paragraph.title;
+      $scope.paragraph.lineNumbers = data.paragraph.lineNumbers;
       $scope.paragraph.status = data.paragraph.status;
       $scope.paragraph.result = data.paragraph.result;
       $scope.paragraph.settings = data.paragraph.settings;
@@ -339,6 +340,24 @@ angular.module('zeppelinWebApp')
     commitParagraph($scope.paragraph.title, $scope.paragraph.text, newConfig, newParams);
   };
 
+  $scope.showLineNumbers = function () {
+    var newParams = angular.copy($scope.paragraph.settings.params);
+    var newConfig = angular.copy($scope.paragraph.config);
+    newConfig.lineNumbers = true;
+    $scope.editor.renderer.setShowGutter(true);
+
+    commitParagraph($scope.paragraph.lineNumbers, $scope.paragraph.text, newConfig, newParams);
+  };
+
+  $scope.hideLineNumbers = function () {
+    var newParams = angular.copy($scope.paragraph.settings.params);
+    var newConfig = angular.copy($scope.paragraph.config);
+    newConfig.lineNumbers = false;
+    $scope.editor.renderer.setShowGutter(false);
+
+    commitParagraph($scope.paragraph.lineNumbers, $scope.paragraph.text, newConfig, newParams);
+  };
+
   $scope.columnWidthClass = function(n) {
     if ($scope.asIframe) {
       return 'col-md-12';
@@ -399,8 +418,10 @@ angular.module('zeppelinWebApp')
 
     $scope.editor = _editor;
     if (_editor.container.id !== '{{paragraph.id}}_editor') {
-      $scope.editor.renderer.setShowGutter(false);
+      $scope.editor.renderer.setShowGutter($scope.paragraph.config.lineNumbers);
+      $scope.editor.setShowFoldWidgets(false);
       $scope.editor.setHighlightActiveLine(false);
+      $scope.editor.setHighlightGutterLine(false);
       $scope.editor.setTheme('ace/theme/github');
       $scope.editor.focus();
       var hight = $scope.editor.getSession().getScreenLength() * $scope.editor.renderer.lineHeight
+ $scope.editor.renderer.scrollBar.getWidth();

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6d42af17/zeppelin-web/src/app/notebook/paragraph/paragraph.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.html b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
index dd5c325..321da26 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
@@ -435,6 +435,14 @@ limitations under the License.
              ng-click="showTitle()"
              ng-show="!paragraph.config.title"> Show title</a>
         </li>
+        <li>
+          <a class="fa fa-list-ol" style="cursor:pointer"
+             ng-click="hideLineNumbers()"
+             ng-show="paragraph.config.lineNumbers"> Hide line numbers</a>
+          <a class="fa fa-list-ol" style="cursor:pointer"
+             ng-click="showLineNumbers()"
+             ng-show="!paragraph.config.lineNumbers"> Show line numbers</a>
+        </li>
 
         <li><a class="icon-share-alt" style="cursor:pointer"
                ng-click="goToSingleParagraph()"> Link this paragraph</a>


Mime
View raw message