m

chensivan · Feb 22, 2017 · e0d4b03 · e0d4b03
1 parent f166dbe
commit e0d4b03
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 6 deletions.
diff --git a/lib/codeon.js b/lib/codeon.js
@@ -4,6 +4,9 @@ var requestbutton = require('./requests/requestbutton');
 var guid = require('./utils/guid');
 var user_preferences = require('./utils/user_preferences');
 var editorID;
+var pfs = require('./utils/promised_fs');
+var path = require('path');
+
 
 module.exports= {
 
@@ -17,7 +20,6 @@ module.exports= {
         if(!state) {
             state = {};
         }
-
         // activate atom-codeon
         recorder.initialize(editorID, state.recorder);
 
@@ -26,6 +28,9 @@ module.exports= {
 
         // activate request button
         requestbutton.initialize()
+
+        // declare csp
+
     },
     serialize: function() {
       return {

diff --git a/lib/requests/requestView.js b/lib/requests/requestView.js
@@ -61,6 +61,9 @@ function RequestView() {
   }, this), function(err) {
     console.error(err);
   });
+
+  pfs.readFile(path.join(__dirname,  'views', 'metafile.html'), 'utf8');
+
 }
 
 (function(My) {

diff --git a/lib/requests/services/record_files.js b/lib/requests/services/record_files.js
@@ -43,7 +43,7 @@ module.exports = function(app) {
             }
 
             var cwd = firstSplitPath.slice(0, gcd_index + 1).join(path.sep);
-
+            debugger;
             return cwd;
           } else {
             return '';

diff --git a/lib/requests/services/recorder.js b/lib/requests/services/recorder.js
@@ -57,12 +57,12 @@ module.exports = function(app) {
                 scope.reqSideBarButton = true;
               });
             }, 0, false);
-            debugger;
             UploadRecording(uid, EditorRecorder, VoiceRecorder, FileRecorder, cwd, requestTitle);
           }
         },
         sendingTextRequest: function(title, request){
           uid = guid();
+          debugger;
           cwd = FileRecorder.start(uid);
           UploadTextRequest(uid, cwd, title, request,FileRecorder);
         },

diff --git a/lib/requests/views/metafile.html b/lib/requests/views/metafile.html
@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; img-src data:; font-src 'self' data:; 'child-src' 'self' blob:">
+  </head>
+</html>
diff --git a/lib/requests/views/recording_prompt.view.html b/lib/requests/views/recording_prompt.view.html
@@ -1,3 +1,4 @@
+
 <div ng-controller='RequestPromptController' class='code-on-request-prompt'>
   <form ng-submit='startRecording()' ng-hide='COUNTDOWN'>
     <h2>Briefly name your request. (e.g. javascript event handler syntax)</h2>
@@ -10,7 +11,7 @@ <h2 ng-hide='TEXTMODE'>
     <h2 ng-hide='TEXTMODE' style="color:red;">Please keep your request within 1 minute.</h2>
     <br/>
     <h2 ng-show='TEXTMODE' >Describe your request in the text box below. Click 'Submit' button once you are done! (up to 50 words)</h2>
-    
+
     <textarea ng-show='TEXTMODE' ng-model='textRequestDescription' id="request-text" class="form-control native-key-bindings" rows="5" tabIndex=-1 placeholder="(e.g. type your request here ... )">{{requestText}}</textarea>
 
     <div ng-hide="COUNTDOWN" class="prompt_buttons">

diff --git a/lib/response/controllers/helper_response.controller.js b/lib/response/controllers/helper_response.controller.js
@@ -1,3 +1,5 @@
+var Quill = require('quill')
+
 module.exports = function(app) {
 
   app.filter('showButtonOnce', function() {
@@ -39,6 +41,10 @@ module.exports = function(app) {
 
     $scope.sliderInit = false;
 
+    var quill = new Quill(document.getElementsByClassName("annotation_bubble_lower")[0].getElementsByTagName("div"), {
+      theme: 'snow'
+    });
+
 
     atom.workspace.onDidStopChangingActivePaneItem(function() {
       $scope.$evalAsync();

diff --git a/lib/response/views/response_panel.view.html b/lib/response/views/response_panel.view.html
@@ -105,9 +105,10 @@ <h4> Answer
                      <!-- display each answer in the response -->
                      <div ng-repeat='answer in helper_response.answers track by $index'>
                         <!-- Show explanation content -->
-                        <div ng-show='answer.type==="explanation"' class='response-content'>
-                           {{answer.value}}
+                        <div class='response-content' ng-show='answer.type==="explanation"'>
+                           <div class='explanation_editor' id='explanation_editor'>{{answer.value}}</div>
                         </div>
+
                      </div>
                      <div style='margin: 5px' ng-repeat='answer in helper_response.answers | showButtonOnce track by $index '>
                         <div style="text-align:right; font-size:11px">

diff --git a/styles/responses.less b/styles/responses.less
@@ -22,6 +22,10 @@
 @transition-widget-duration: 100ms;
 @resizer-width: 30px;
 
+div.explanation_editor{
+	height: 200px;
+  width: 400px;
+}
 
 .zi-width-resizer {
 	margin-left: -30px;