From a70c62891d0c7dd032d9382c50d1555ab81c4e33 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 27 Feb 2012 16:24:13 -0800
Subject: Fixing tooltips and keyboard shortcuts for 3d tools.

IKNinja-1014 and IKNinja-1015.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/mediators/keyboard-mediator.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 5b044f8a..a2589340 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -162,6 +162,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                     return;
                 }
 
+                // Rotate Stage Tool is M
+                if(evt.keyCode === Keyboard.M ) {
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]});
+                    return;
+                }
+
                 // Hand tool
                 if(evt.keyCode === Keyboard.H ) {
                     evt.preventDefault();
-- 
cgit v1.2.3


From 7cbd26d475eaad817042692f9116f9a24ae60997 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Tue, 28 Feb 2012 10:24:06 -0800
Subject: Bug fixes:

1152: allow deleting of multiple paths from inside pen tool
1128: keyboard hotkey shortcut 'P' for pen tool
941: changing width or height of the path scales the path
---
 js/mediators/keyboard-mediator.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 5b044f8a..63cffec3 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -136,6 +136,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                     return;
                 }
 
+                // shortcut for Pen tool is P
+                if (evt.keyCode === Keyboard.P){
+                    evt.preventDefault();
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[5]});
+                    return;
+                }
+
                 // Shortcut for Rectangle Tool is R
                 // unless the user is pressing the command key.
                 // If the user is pressing the command key, they want to refresh the browser.
-- 
cgit v1.2.3


From 2ce9f65c3a34937928f08690606962af3085c74f Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 28 Feb 2012 15:03:23 -0800
Subject: CSS attributes

Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save.
---
 js/mediators/io-mediator.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 733e44b2..6b26668b 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -260,6 +260,17 @@ exports.IoMediator = Montage.create(Component, {
     			var styleCounter = 0,
     				docStyles = template.document.content.document.getElementsByTagName('style'),
     				docLinks = template.document.content.document.getElementsByTagName('link');
+    			//Removing Ninja Data Attributes
+    			for (var n in docLinks) {
+    				if (docLinks[n].attributes) {
+    					for (var m in docLinks[n].attributes) {
+							if (docLinks[n].attributes[m].name && docLinks[n].attributes[m].name.indexOf('data-ninja')!=-1) {
+								docLinks[n].removeAttribute(docLinks[n].attributes[m].name);
+							}
+						}
+    				}
+    			}
+    			//
     			for(var i in template.css) {
     				if (template.css[i].ownerNode) {
     					if (template.css[i].ownerNode.getAttribute) {
@@ -268,6 +279,22 @@ exports.IoMediator = Montage.create(Component, {
     							docStyles[styleCounter].innerHTML = this.getCssFromRules(template.css[i].cssRules);
     							styleCounter++;
     						} else {
+    							//Checking for attributes to be added to tag upon saving
+    							for (var k in docLinks) {
+    								if (docLinks[k].getAttribute) {
+    									if (docLinks[k].getAttribute('href') && ('/'+docLinks[k].getAttribute('href')) === template.css[i].ownerNode.getAttribute('data-ninja-file-url')) {
+    										for (var l in template.css[i].ownerNode.attributes) {
+    											if (template.css[i].ownerNode.attributes[l].value) {
+    												if (template.css[i].ownerNode.attributes[l].name.indexOf('data-ninja')!=-1) {
+    													//Ninja attribute...
+    												} else {
+    													docLinks[k].setAttribute(template.css[i].ownerNode.attributes[l].name, template.css[i].ownerNode.attributes[l].value);
+    												}
+    											}
+    										}
+    									}
+    								}
+    							}
     							//Saving data from rules array converted to string into <link> file
     							var save = this.fio.saveFile({uri: template.css[i].ownerNode.getAttribute('data-ninja-uri'), contents: this.getCssFromRules(template.css[i].cssRules)});
     						}
-- 
cgit v1.2.3


From 795329d2225ff3b760f7f0ea3bb6b5e68f6c6b5b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 29 Feb 2012 10:07:53 -0800
Subject: Making class level url template variable

Created a class level variable for the URL to be parsed out of the user files.
---
 js/mediators/io-mediator.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 6b26668b..e763c67c 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -38,6 +38,12 @@ exports.IoMediator = Montage.create(Component, {
     pio: {
     	enumerable: false,
     	value: ProjectIo
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    appTemplatesUrl: {
+    	enumerable: false,
+    	value: new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi')
     },
 	////////////////////////////////////////////////////////////////////
     //
@@ -209,8 +215,7 @@ exports.IoMediator = Montage.create(Component, {
     		template.document.content.document.head.innerHTML = template.head;
     		//Getting all CSS (style or link) tags
     		var styletags = template.document.content.document.getElementsByTagName('style'),
-    			linktags = template.document.content.document.getElementsByTagName('link'),
-    			url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi'); //TODO: Make public into var
+    			linktags = template.document.content.document.getElementsByTagName('link');
     		//Looping through link tags and removing file recreated elements
     		for (var j in styletags) {
     			if (styletags[j].getAttribute) {
@@ -345,7 +350,7 @@ exports.IoMediator = Montage.create(Component, {
     			webgltag.innerHTML = json;
     		}
     		//
-    		return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(url, ''));
+    		return this.getPrettyHtml(template.document.content.document.documentElement.outerHTML.replace(this.appTemplatesUrl, ''));
     	}
     },
     ////////////////////////////////////////////////////////////////////
@@ -354,7 +359,7 @@ exports.IoMediator = Montage.create(Component, {
     	enumerable: false,
     	value: function (list) {
     		//Variable to store CSS definitions
-    		var i, str, url, css = '';
+    		var i, str, css = '';
     		//Looping through list
     		if (list && list.length > 0) {
     			//Adding each list item to string and also adding breaks
@@ -362,10 +367,8 @@ exports.IoMediator = Montage.create(Component, {
     				css += list[i].cssText;
     			}
     		}
-    		//TODO: Add better logic for creating this string
-    		url = new RegExp(chrome.extension.getURL('js/document/templates/montage-html/'), 'gi');
     		//Returning the CSS string
-    		return this.getPrettyCss(css.replace(url, ''));
+    		return this.getPrettyCss(css.replace(this.appTemplatesUrl, ''));
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3