Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts: js/helper-classes/3D/StageLine.js
author: hwc487 2012-07-09 16:08:02 -0700
committer: hwc487 2012-07-09 16:08:02 -0700
commit: 5085d0f67df89a21715308956004164597a6ba79 (patch)
tree: 2c896163143a66331205a39b0a3b1b45d51bf12a /js/document/templates/preview
parent: 51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download: ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
1 files changed, 50 insertions, 50 deletions
diff --git a/js/document/templates/preview/banner.html b/js/document/templates/preview/banner.html
index 1860e314..a9a54251 100755
--- a/js/document/templates/preview/banner.html
+++ b/js/document/templates/preview/banner.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -28,61 +28,61 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
- 
 <html>
-        <head>
+    <head>
-        
-        <style type="text/css">
+        <style type="text/css">
-                
-                html, body {
+            html, body {
-                        width: 100%;
+                width: 100%;
-                        height: 100%;
+                height: 100%;
-                        margin: 0;
+                margin: 0;
-                        padding: 0;
+                padding: 0;
-                        background: #333;
+                background: #333;
-                }
+            }
-                
-                .preview {
+            .preview {
-                        position: absolute;
+                position: absolute;
-                        top: 50%;
+                top: 50%;
-                        left: 50%;
+                left: 50%;
-                        margin: 0;
+                margin: 0;
-                        padding: 0;
+                padding: 0;
-                        border: 1px solid #000;
+                border: 1px solid #000;
-                        background: #FFF;
+                background: #FFF;
-                        -webkit-box-shadow: 0 0 16px #000;
+                -webkit-box-shadow: 0 0 16px #000;
-                }
+            }
-                
        </style>
-        
        <script type="text/javascript">
-                //
+            //
-                window.addEventListener('load', loadBanner, false);
+            window.addEventListener('load', loadBanner, false);
-                //
+            //
-                function loadBanner (e) {
+            function loadBanner (e) {
-                        var iframe = document.getElementsByTagName('iframe')[0];
+                var iframe = document.getElementsByTagName('iframe')[0];
-                        iframe.src = qs('url');
+                iframe.src = qs('url');
-                        iframe.style.width = qs('width')+'px';
+                iframe.style.width = qs('width')+'px';
-                        iframe.style.height = qs('height')+'px';
+                iframe.style.height = qs('height')+'px';
-                        iframe.style.marginLeft = -1*qs('width')/2+'px';
+                iframe.style.marginLeft = -1*qs('width')/2+'px';
-                        iframe.style.marginTop = -1*qs('height')/2+'px';
+                iframe.style.marginTop = -1*qs('height')/2+'px';
-                }
+            }
-                /*
+            /*
-                Taken from:
+            Taken from:
-                http://stackoverflow.com/questions/7731778/jquery-get-query-string-parameters
+            http://stackoverflow.com/questions/7731778/jquery-get-query-string-parameters
-                */
+            */
-                function qs(key) {
+            function qs(key) {
-                        key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
+                key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
-                        var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
+                var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
-                        return match && decodeURIComponent(match[1]);
+                return match && decodeURIComponent(match[1]);
-                        }
+            }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-                <iframe class="preview"></iframe>
+        <iframe class="preview"></iframe>
-        </body>
+    </body>
 </html>
author	hwc487	2012-07-09 16:08:02 -0700
committer	hwc487	2012-07-09 16:08:02 -0700
commit	5085d0f67df89a21715308956004164597a6ba79 (patch)
tree	2c896163143a66331205a39b0a3b1b45d51bf12a /js/document/templates/preview
parent	51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
download	ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz

diff --git a/js/document/templates/preview/banner.html b/js/document/templates/preview/banner.html index 1860e314..a9a54251 100755 --- a/js/document/templates/preview/banner.html +++ b/js/document/templates/preview/banner.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.
@@ -28,61 +28,61 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	30	</copyright> -->
31		31
32	<html>	32	<html>
33		33
34	<head>	34	<head>
35		35
36	<style type="text/css">	36	<style type="text/css">
37		37
38	html, body {	38	html, body {
39	width: 100%;	39	width: 100%;
40	height: 100%;	40	height: 100%;
41	margin: 0;	41	margin: 0;
42	padding: 0;	42	padding: 0;
43	background: #333;	43	background: #333;
44	}	44	}
45		45
46	.preview {	46	.preview {
47	position: absolute;	47	position: absolute;
48	top: 50%;	48	top: 50%;
49	left: 50%;	49	left: 50%;
50	margin: 0;	50	margin: 0;
51	padding: 0;	51	padding: 0;
52	border: 1px solid #000;	52	border: 1px solid #000;
53	background: #FFF;	53	background: #FFF;
54	-webkit-box-shadow: 0 0 16px #000;	54	-webkit-box-shadow: 0 0 16px #000;
55	}	55	}
56		56
57	</style>	57	</style>
58		58
59	<script type="text/javascript">	59	<script type="text/javascript">
60	//	60	//
61	window.addEventListener('load', loadBanner, false);	61	window.addEventListener('load', loadBanner, false);
62	//	62	//
63	function loadBanner (e) {	63	function loadBanner (e) {
64	var iframe = document.getElementsByTagName('iframe')[0];	64	var iframe = document.getElementsByTagName('iframe')[0];
65	iframe.src = qs('url');	65	iframe.src = qs('url');
66	iframe.style.width = qs('width')+'px';	66	iframe.style.width = qs('width')+'px';
67	iframe.style.height = qs('height')+'px';	67	iframe.style.height = qs('height')+'px';
68	iframe.style.marginLeft = -1*qs('width')/2+'px';	68	iframe.style.marginLeft = -1*qs('width')/2+'px';
69	iframe.style.marginTop = -1*qs('height')/2+'px';	69	iframe.style.marginTop = -1*qs('height')/2+'px';
70	}	70	}
71	/*	71	/*
72	Taken from:	72	Taken from:
73	http://stackoverflow.com/questions/7731778/jquery-get-query-string-parameters	73	http://stackoverflow.com/questions/7731778/jquery-get-query-string-parameters
74	*/	74	*/
75	function qs(key) {	75	function qs(key) {
76	key = key.replace(/[*+?^$.\[\]{}()\|\\\/]/g, "\\$&"); // escape RegEx meta chars	76	key = key.replace(/[*+?^$.\[\]{}()\|\\\/]/g, "\\$&"); // escape RegEx meta chars
77	var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&\|$)"));	77	var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&\|$)"));
78	return match && decodeURIComponent(match[1]);	78	return match && decodeURIComponent(match[1]);
79	}	79	}
80	</script>	80	</script>
81		81
82	</head>	82	</head>
83		83
84	<body>	84	<body>
85	<iframe class="preview"></iframe>	85	<iframe class="preview"></iframe>
86	</body>	86	</body>
87		87
88	</html>	88	</html>