From 604ace9cfc9fae6b6c121259523a9060c5306161 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 27 Feb 2012 11:59:58 -0800
Subject: - save show3DGrid flag per document while switching documents - fix
 zoom tool keyboard control to listen to Z when ctrl and shift keys are not
 pressed with it

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/document/html-document.js      | 4 ++++
 js/mediators/keyboard-mediator.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 8798b407..c36e61d5 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -623,6 +623,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
                 this.selectionModel = this.application.ninja.selectedElements;
             }
+
+            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
         }
     },
 
@@ -644,6 +646,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
             }
             this.application.ninja.stage.handleScroll();
+
+            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
         }
     }
 	////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index f05d3382..e5b50b03 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -170,7 +170,7 @@ exports.KeyboardMediator = Montage.create(Component, {
                 }
 
                 // Zoom tool
-                if(evt.keyCode === Keyboard.Z ) {
+                if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z
                     evt.preventDefault();
                     this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
                     return;
-- 
cgit v1.2.3


From 3e2889b94d5e6af93ec0eaca114802e30c8c38ef Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 27 Feb 2012 14:29:17 -0800
Subject: Updating credits

---
 credits.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/credits.html b/credits.html
index 1cc36c78..082eefd4 100644
--- a/credits.html
+++ b/credits.html
@@ -95,5 +95,14 @@
             <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li>
         </ul>
     </div>
+
+    <div>
+        js-beautify
+        <ul>
+            <li>Written by Einar Lielmanis, <a href="mailto:einar@jsbeautifier.org">einar@jsbeautifier.org</a>. Python version flourished by <a href="http://github.com/satufk">Stefano Sanfilippo</a> with help from <a href="http://jason.diamond.name/weblog/">Jason&nbsp;Diamond</a>, Patrick&nbsp;Hof, Nochum&nbsp;Sossonko, Andreas&nbsp;Schneider, Dave&nbsp;Vasilevsky, <a href="http://my.opera.com/Vital/blog/">Vital&nbsp;Batmanov,</a> Ron&nbsp;Baldwin, Gabriel&nbsp;Harrison, <a href="http://shullian.com">Chris&nbsp;J.&nbsp;Shull</a>, <a href="http://mathiasbynens.be/">Mathias Bynens</a> and others.</li>
+            <li>Code from: <a href="https://github.com/einars/js-beautify" target="_blank">https://github.com/einars/js-beautify</a></li>
+            <li>License: <a href="https://github.com/einars/js-beautify/blob/master/license.txt" target="_blank">https://github.com/einars/js-beautify/blob/master/license.txt</a></li>
+        </ul>
+    </div>
 	</body>
 </html>
\ No newline at end of file
-- 
cgit v1.2.3