Added highlighting of document contents.

hrishikeshs · Jun 8, 2014 · a92ceb0 · a92ceb0
1 parent fdf08e0
commit a92ceb0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Mongoman/app/assets/javascripts/controllers/documents_controller.js b/Mongoman/app/assets/javascripts/controllers/documents_controller.js
@@ -17,7 +17,7 @@ Mongoman.DocumentsController = Ember.ArrayController.extend({
     var keys = str.match(/[a-zA-Z0-9_\"\s\']+:\s+/g);
     if (keys) {
       for (var i = 0, j = keys.length; i < j; i++) {
-        str = str.replace(keys[i],'"' + keys[i].split(':')[0] + '":' );
+        str = str.replace(keys[i],'"' + keys[i].split(':')[0].trim() + '":' );
       }
     }
     else {

diff --git a/Mongoman/app/assets/javascripts/helpers/parse_json_helper.js b/Mongoman/app/assets/javascripts/helpers/parse_json_helper.js
@@ -6,7 +6,20 @@ Ember.Handlebars.registerBoundHelper('parseJSONString', function (json) {
 
     switch(type) {
 
-      case 'string' : return '"' + Handlebars.Utils.escapeExpression(json) + '"';
+      case 'string' : 
+        if(json.match(/^ObjectId*/)) {
+          return '<span class="special-form" style="display:none;">"</span>' + '<span style="color: #dd1144;"> ' +
+              Handlebars.Utils.escapeExpression(json) + '</span>' + '<span class="special-form" style="display:none;">"</span>'
+        }
+        else if(json.match(/^ISODate*/)) {
+         return '<span class="special-form" style="display:none;">"</span>' + '<span style="color: rgb(176, 96, 214);"> ' +
+              Handlebars.Utils.escapeExpression(json) + '</span>' + '<span class="special-form" style="display:none;">"</span>' 
+        }
+
+        return '<span style="color: rgb(11, 168, 36);">"' +
+              Handlebars.Utils.escapeExpression(json) + '"</span>';
+
+
       case 'number' :
       case 'undefined' :
       case 'boolean' :
@@ -25,7 +38,7 @@ Ember.Handlebars.registerBoundHelper('parseJSONString', function (json) {
             var htmlArray = [];
             for(var i = 0, len = keys.length; i < len; i++) {
                 var k = keys[i];
-                var html = "<br /><div class='showhide'><strong>" + k + '</strong>' + ':  '  + "<span style='overflow:auto;'>" + prettyPrint(json[k]) + "</span></div>";
+                var html = "<br /><div class='showhide'><strong style='color: rgb(51, 15, 241);'>" + k + '</strong>' + ':    '  + "<span style='overflow:auto;padding-left:10px;'>" + prettyPrint(json[k]) + "</span></div>";
                 htmlArray.push(html);
             }
             return '{' + "<div class='collapsible'>" + htmlArray.join() + '<br />' + '</div>}';

diff --git a/Mongoman/app/assets/javascripts/templates/document.handlebars b/Mongoman/app/assets/javascripts/templates/document.handlebars
@@ -3,6 +3,6 @@
 </button>
 <button class='edit-save-button' {{action 'editOrSaveDocument' target='view'}} title='syntax is key:[space]value-in-double-quotes'>
 Edit</button>
-<div contenteditable='false' class='document-content'>
+<div contenteditable='false' class='document-content' spellcheck="false">
   {{parseJSONString view.content}}
 </div>
diff --git a/Mongoman/app/assets/javascripts/views/document_view.js b/Mongoman/app/assets/javascripts/views/document_view.js
@@ -15,7 +15,7 @@ Mongoman.DocumentView = Ember.View.extend({
       }
       else {
         this.$('.document-content')[0].contentEditable = false
-        var updated_document = this.$('.document-content').text()
+        var updated_document = this.$('.document-content').text();
         var jsonified = this.get('controller.jsonifyText')(updated_document.trim())
         var url = '/documents/id?'
         Mongoman.PostRequest.post(url , {database_name : this.get('controller.database_name'), collection_name: this.get('controller.collection_name')}, 'PUT', jsonified)

diff --git a/Mongoman/app/assets/stylesheets/_pages/common_classes.scss b/Mongoman/app/assets/stylesheets/_pages/common_classes.scss
@@ -26,4 +26,4 @@
 .flex {
   display: flex;
   align-items: center;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ @@
     .flex {
       display: flex;
       align-items: center;
-    }
+    }