Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

duaraghav8@gmail · duaraghav8@gmail · commit ffab3e9787bf · 2016-05-27T22:51:11.000+05:30
diff --git a/algorithm/cryptography/caesar_cipher/basic/code.js b/algorithm/cryptography/caesar_cipher/basic/code.js
@@ -10,7 +10,7 @@ function getNextChar(currChar, direction) {
   var pos = alphabetMap[currChar];
   var nextPos = direction === 'up' ? getPosUp(pos) : getPosDown(pos);
   var nextChar = alphabet.charAt(nextPos);
-  
+
   logger._print(currChar + ' -> ' + nextChar);
   return nextChar;
 }
@@ -21,24 +21,23 @@ function cipher(str, rotation, direction, cipherTracer) {
   for (var i = 0; i < str.length; i++) {
 
     cipherTracer._wait();
-    
+
     var currChar = str.charAt(i);
     var r = rotation;
 
     logger._print('Rotating ' + currChar + ' ' + direction + ' ' + rotation + ' times');
-    cipherTracer._notify(i)._wait();
+    cipherTracer._select(i)._wait();
 
     // perform given amount of rotations in the given direction
-    while (--r > 0) {
+    while (r-- > 0) {
       currChar = getNextChar(currChar, direction);
       cipherTracer._notify(i, currChar)._wait();
     }
-    
+
     str = str.substring(0, i) + currChar + str.substring(i + 1);
     logger._print('Current result: ' + str);
   }
-
-  cipherTracer._select(0, i);
+    
   return str;
 }
 
diff --git a/css/stylesheet.css b/css/stylesheet.css
@@ -65,7 +65,7 @@ button:not([disabled]):hover {
 
 .btn.active,
 button.active {
-    background: rgba(0, 0, 0, .28);
+    background: rgb(38, 38, 38);
 }
 
 .btn input,
@@ -138,7 +138,7 @@ nav h3 {
 }
 
 .sidemenu #footer {
-    border-top: 2px solid rgba(0, 0, 0, .28);
+    border-top: 2px solid rgb(38, 38, 38);
 }
 
 .sidemenu button {
@@ -181,7 +181,7 @@ section,
 
 nav,
 section {
-    border: 1px solid rgba(0, 0, 0, .28);
+    border: 1px solid rgb(38, 38, 38);
     box-sizing: border-box;
 }
 
@@ -227,7 +227,7 @@ section {
     z-index: 5;
     padding: 4px;
     font-size: 14px;
-    background: rgba(0, 0, 0, .28);
+    background: rgba(0, 0, 0, .4);
 }
 
 .module_wrapper > .wrapper {
@@ -299,10 +299,11 @@ section {
 }
 
 .explanation_container {
+    border: none;
     top: 30px;
     height: 30px;
-    background: rgba(0, 0, 0, .28);
-    padding: 7px;
+    background: rgb(38, 38, 38);
+    padding: 8px;
     font-size: 12px;
 }
 
diff --git a/js/module/array2d.js b/js/module/array2d.js
@@ -100,7 +100,7 @@ Array2DTracer.prototype = $.extend(true, Object.create(Tracer.prototype), {
             case 'notify':
                 if (step.v) {
                     var $row = this.$table.find('.mtbl-row').eq(step.x);
-                    $row.find('.mtbl-cell').eq(step.y).text(TracerUtil.refineNumber(step.v));
+                    $row.find('.mtbl-cell').eq(step.y).text(TracerUtil.refineByType(step.v));
                 }
             case 'denotify':
             case 'select':
@@ -130,7 +130,7 @@ Array2DTracer.prototype = $.extend(true, Object.create(Tracer.prototype), {
         if (Tracer.prototype.setData.apply(this, arguments)) {
             this.$table.find('.mtbl-row').each(function (i) {
                 $(this).children().each(function (j) {
-                    $(this).text(TracerUtil.refineNumber(D[i][j]));
+                    $(this).text(TracerUtil.refineByType(D[i][j]));
                 });
             });
             return true;
@@ -143,7 +143,7 @@ Array2DTracer.prototype = $.extend(true, Object.create(Tracer.prototype), {
             for (var j = 0; j < D[i].length; j++) {
                 var $cell = $('<div class="mtbl-cell">')
                     .css(this.getCellCss())
-                    .text(TracerUtil.refineNumber(D[i][j]));
+                    .text(TracerUtil.refineByType(D[i][j]));
                 $row.append($cell);
             }
         }
diff --git a/js/module/weighted_directed_graph.js b/js/module/weighted_directed_graph.js
@@ -45,15 +45,15 @@ WeightedDirectedGraphTracer.prototype = $.extend(true, Object.create(DirectedGra
         switch (step.type) {
             case 'weight':
                 var targetNode = this.graph.nodes(this.n(step.target));
-                if (step.weight !== undefined) targetNode.weight = TracerUtil.refineNumber(step.weight);
+                if (step.weight !== undefined) targetNode.weight = TracerUtil.refineByType(step.weight);
                 break;
             case 'visit':
             case 'leave':
                 var visit = step.type == 'visit';
                 var targetNode = this.graph.nodes(this.n(step.target));
                 var color = visit ? this.color.visited : this.color.left;
                 targetNode.color = color;
-                if (step.weight !== undefined) targetNode.weight = TracerUtil.refineNumber(step.weight);
+                if (step.weight !== undefined) targetNode.weight = TracerUtil.refineByType(step.weight);
                 if (step.source !== undefined) {
                     var edgeId = this.e(step.source, step.target);
                     var edge = this.graph.edges(edgeId);
@@ -97,7 +97,7 @@ WeightedDirectedGraphTracer.prototype = $.extend(true, Object.create(DirectedGra
                         target: this.n(j),
                         color: this.color.default,
                         size: 1,
-                        weight: TracerUtil.refineNumber(G[i][j])
+                        weight: TracerUtil.refineByType(G[i][j])
                     });
                 }
             }
diff --git a/js/tracer_manager.js b/js/tracer_manager.js
@@ -189,6 +189,12 @@ var TracerUtil = {
             return value === "Infinity" ? Infinity : value;
         });
     },
+    refineByType: function (item) {
+      return $.isNumeric(item) ? this.refineNumber(item) : this.refineString(item);  
+    },
+    refineString: function (string) {
+        return string === '' ? ' ' : string;
+    },
     refineNumber: function (number) {
         return number === Infinity ? '&infin;' : number;
     }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ button:not([disabled]):hover {`
`65`	`65`
`66`	`66`	`.btn.active,`
`67`	`67`	`button.active {`
`68`		`- background: rgba(0, 0, 0, .28);`
	`68`	`+ background: rgb(38, 38, 38);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`.btn input,`
`@@ -138,7 +138,7 @@ nav h3 {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`.sidemenu #footer {`
`141`		`- border-top: 2px solid rgba(0, 0, 0, .28);`
	`141`	`+ border-top: 2px solid rgb(38, 38, 38);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`.sidemenu button {`
`@@ -181,7 +181,7 @@ section,`
`181`	`181`
`182`	`182`	`nav,`
`183`	`183`	`section {`
`184`		`- border: 1px solid rgba(0, 0, 0, .28);`
	`184`	`+ border: 1px solid rgb(38, 38, 38);`
`185`	`185`	`box-sizing: border-box;`
`186`	`186`	`}`
`187`	`187`
`@@ -227,7 +227,7 @@ section {`
`227`	`227`	`z-index: 5;`
`228`	`228`	`padding: 4px;`
`229`	`229`	`font-size: 14px;`
`230`		`- background: rgba(0, 0, 0, .28);`
	`230`	`+ background: rgba(0, 0, 0, .4);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`.module_wrapper > .wrapper {`
`@@ -299,10 +299,11 @@ section {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`.explanation_container {`
	`302`	`+ border: none;`
`302`	`303`	`top: 30px;`
`303`	`304`	`height: 30px;`
`304`		`- background: rgba(0, 0, 0, .28);`
`305`		`- padding: 7px;`
	`305`	`+ background: rgb(38, 38, 38);`
	`306`	`+ padding: 8px;`
`306`	`307`	`font-size: 12px;`
`307`	`308`	`}`
`308`	`309`