showing explanation with context

chensivan · Mar 12, 2017 · 49cdf07 · 49cdf07
1 parent d1ad8c7
commit 49cdf07
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 11 deletions.
diff --git a/lib/response/controllers/helper_response.controller.js b/lib/response/controllers/helper_response.controller.js
@@ -3,6 +3,7 @@ var Quill = require('quill')
 var trix = require('angular-trix')
 var trixx = require('trix')
 require('qtip')
+var _ = require('underscore')
 module.exports = function(app) {
 
   app.filter('showButtonOnce', function() {
@@ -61,7 +62,7 @@ module.exports = function(app) {
         };
     });
 
-  app.controller("HelperResponse", ['$scope', '$rootScope', 'QuestionManager', 'Slider', 'RequestReplayer', 'ResponseManager', function($scope, $rootScope, QuestionManager, Slider, RequestReplayer) {
+  app.controller("HelperResponse", ['$scope', '$rootScope', 'QuestionManager', 'Slider', 'RequestReplayer', 'ResponseManager', function($scope, $rootScope, QuestionManager, Slider, RequestReplayer,ResponseManager) {
     $scope.hasReplay = false;
     $scope.show = false;
     debugger;
@@ -96,13 +97,17 @@ module.exports = function(app) {
             if (range) {
               if (range.length == 0) {
                 console.log('User cursor is on', range.index);
-                // ResponseManager.showContextInExplanation(obj.markdownAnswers);
+                ResponseManager.showContextInExplanation(obj.markdownAnswers,range.index);
+
               }
             }
           })
         }
       }
     })
+    // this is to remove the new class that automatically added
+    $('.ql-clipboard').removeAttr('contenteditable')
+    // document.getElementsByClassName("ql-clipboard").setAttribute('contenteditable', 'false')
 
     atom.workspace.onDidStopChangingActivePaneItem(function() {
       $scope.$evalAsync();

diff --git a/lib/response/controllers/request.controller.js b/lib/response/controllers/request.controller.js
@@ -1,5 +1,5 @@
 var TooltipView = require('../../utils/requestbutton-view.js');
-
+var _ = require('underscore')
 
 
 module.exports = function(app) {

diff --git a/lib/response/services/response_manager.js b/lib/response/services/response_manager.js
@@ -67,7 +67,6 @@ module.exports = function(app) {
 			tooltipMarkers.push(marker.marker);
 		}
 
-		//need to fix this function
 		function removeMarker(markers){
 			for(i=0;i<markers.length;i++){
 				markers.forEach(function(mk){
@@ -463,14 +462,51 @@ module.exports = function(app) {
 					}
 				}
 			},
-			showContextInExplanation: function(codeContext){
+			showContextInExplanation: function(codeContext, curose_location){
+				debugger
+				//remove all decoration
+				destroyAllMarkers();
+
 				//check if the window is splitted
 				if(atom.workspace.getPanes().length>1){
+
 					//go to the splitted tab
-					if(atom.workspace.getActivePane() != atom.workspace.getPanes()[0]){
+					if(atom.workspace.getActivePane() == atom.workspace.getPanes()[0]){
 						atom.workspace.activatePreviousPane();
 					}
 
+					var len = codeContext.code.selectedrange.length
+					for (var i = 0; i < len; i++) {
+							// var range_start_row = $scope.markdownAnswers.text.selectedrange[i].start.row
+							var range_start_col = codeContext.text.selectedrange[i].start.column
+							// var range_end_row = $scope.markdownAnswers.text.selectedrange[i].end.row
+							var range_end_col = codeContext.text.selectedrange[i].end.column
+
+							if (curose_location >= range_start_col && curose_location <= range_end_col) {
+
+									var editor = atom.workspace.getActiveTextEditor()
+									var highlights = new Range();
+									highlights.start.row = codeContext.code.selectedrange[i].start.row
+									highlights.start.column = codeContext.code.selectedrange[i].start.column
+									highlights.end.row = codeContext.code.selectedrange[i].end.row
+									highlights.end.column = codeContext.code.selectedrange[i].end.column
+
+									var explanationCodeContext = editor.markBufferRange(highlights, {
+					          invalidate: 'inside',
+					        });
+					        // Decorate the lineMarker.
+									debugger
+					        editor.decorateMarker(explanationCodeContext, {
+										class: 'test-pkg-highlight',
+										type: 'highlight'
+									});
+
+
+									// session.addMarker(highlights, "ace_context", "text")
+									break;
+							}
+					}
+
 					//
 				}else{
 					//do nothing if there is no splitted window

diff --git a/lib/response/views/response_panel.view.html b/lib/response/views/response_panel.view.html
@@ -131,7 +131,7 @@ <h4> Answer
                   <!-- <div ng-repeat='answer in helper_response.answers track by $index'> -->
                      <!-- Show explanation content -->
                      <div class='response-content'>
-                       <div id="editor-container">
+                       <div id="editor-container" class='inset-panel panel-bottom run-command native-key-bindings' tabindex= '-1' readonly>
                        </div>
                      </div>
                   <!-- </div> -->

diff --git a/package.json b/package.json
@@ -12,10 +12,6 @@
   "dependencies": {
     "angular": "1.5.5",
     "angular-aria": "1.5.0",
-    "angular-material": "^1.1.3",
-    "angular-moment": "1.5.5",
-    "angular-route": "1.5.5",
-    "angular-socket-io": "1.5.5",
     "angular-trix": "^1.0.2",
     "angular-ui-bootstrap": "1.3.3",
     "angular-xeditable": "0.1.12",