aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/io/ui
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io/ui')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html98
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js170
-rwxr-xr-xjs/io/ui/cloudpopup.reel/css/cloudpopup.scss160
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html2
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css12
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html2
-rw-r--r--js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js22
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css22
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html2
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js14
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.css6
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
15 files changed, 259 insertions, 259 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index cd6e4c94..7bfc110e 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2 2
3<!-- <copyright> 3<!-- <copyright>
4Copyright (c) 2012, Motorola Mobility, Inc 4Copyright (c) 2012, Motorola Mobility, Inc
@@ -29,16 +29,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE. 30POSSIBILITY OF SUCH DAMAGE.
31</copyright> --> 31</copyright> -->
32 32
33<html lang="en"> 33<html lang="en">
34 <head> 34 <head>
35 35
36 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 36 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
37 37
38 <link rel="stylesheet" type="text/css" href="css/cloudpopup.css"> 38 <link rel="stylesheet" type="text/css" href="css/cloudpopup.css">
39 39
40 <script type="text/montage-serialization"> 40 <script type="text/montage-serialization">
41 { 41 {
42 "owner": { 42 "owner": {
43 "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]", 43 "prototype": "js/io/ui/cloudpopup.reel[cloudpopup]",
44 "properties": { 44 "properties": {
@@ -46,44 +46,44 @@ POSSIBILITY OF SUCH DAMAGE.
46 } 46 }
47 } 47 }
48 } 48 }
49 </script> 49 </script>
50 50
51 </head> 51 </head>
52 52
53 <body> 53 <body>
54 54
55 <div data-montage-id="cloud_popup" class="cloud_popup"> 55 <div data-montage-id="cloud_popup" class="cloud_popup">
56 <div class="content"> 56 <div class="content">
57 57
58 <h3>Cloud Service Dialog</h3> 58 <h3>Cloud Service Dialog</h3>
59 59
60 <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> 60 <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
61 61
62 <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" /> 62 <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
63 63
64 <button class="btn_test nj-skinned">Test</button> 64 <button class="btn_test nj-skinned">Test</button>
65 65
66 <label>Status:</label><div class="status">&nbsp;</div> 66 <label>Status:</label><div class="status">&nbsp;</div>
67 67
68 <button class="btn_cancel nj-skinned">Cancel</button> 68 <button class="btn_cancel nj-skinned">Cancel</button>
69 69
70 <button class="btn_ok nj-skinned">Ok</button> 70 <button class="btn_ok nj-skinned">Ok</button>
71 71
72 <section> 72 <section>
73 73
74 <h4>Install Ninja Cloud App</h4> 74 <h4>Install Ninja Cloud App</h4>
75 75
76 <p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p> 76 <p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p>
77 77
78 <div class="cloud_icon"></div> 78 <div class="cloud_icon"></div>
79 79
80 <button class="btn_download nj-skinned">Download</button> 80 <button class="btn_download nj-skinned">Download</button>
81 81
82 </section> 82 </section>
83 83
84 </div> 84 </div>
85 </div> 85 </div>
86 86
87 </body> 87 </body>
88 88
89</html> 89</html>
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index c64d8974..7ae9e892 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -30,136 +30,136 @@ POSSIBILITY OF SUCH DAMAGE.
30 30
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33var Montage = require("montage/core/core").Montage, 33var Montage = require("montage/core/core").Montage,
34 Component = require("montage/ui/component").Component; 34 Component = require("montage/ui/component").Component;
35//////////////////////////////////////////////////////////////////////// 35////////////////////////////////////////////////////////////////////////
36// 36//
37exports.CloudPopup = Montage.create(Component, { 37exports.CloudPopup = Montage.create(Component, {
38 //////////////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////////////
39 // 39 //
40 hasTemplate: { 40 hasTemplate: {
41 value: true 41 value: true
42 }, 42 },
43 //////////////////////////////////////////////////////////////////// 43 ////////////////////////////////////////////////////////////////////
44 // 44 //
45 _os: { 45 _os: {
46 value: null 46 value: null
47 }, 47 },
48 //////////////////////////////////////////////////////////////////// 48 ////////////////////////////////////////////////////////////////////
49 // 49 //
50 components: { 50 components: {
51 enumerable: false, 51 enumerable: false,
52 value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null} 52 value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null}
53 }, 53 },
54 //////////////////////////////////////////////////////////////////// 54 ////////////////////////////////////////////////////////////////////
55 // 55 //
56 prepareForDraw: { 56 prepareForDraw: {
57 enumerable: false, 57 enumerable: false,
58 value: function () { 58 value: function () {
59 // 59 //
60 this.components.test_btn = this.element.getElementsByClassName('btn_test nj-skinned')[0]; 60 this.components.test_btn = this.element.getElementsByClassName('btn_test nj-skinned')[0];
61 this.components.ok_btn = this.element.getElementsByClassName('btn_ok nj-skinned')[0]; 61 this.components.ok_btn = this.element.getElementsByClassName('btn_ok nj-skinned')[0];
62 this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0]; 62 this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0];
63 this.components.status = this.element.getElementsByClassName('status')[0]; 63 this.components.status = this.element.getElementsByClassName('status')[0];
64 this.components.url = this.element.getElementsByClassName('cloud_url')[0]; 64 this.components.url = this.element.getElementsByClassName('cloud_url')[0];
65 this.components.download_btn = this.element.getElementsByClassName('btn_download nj-skinned')[0]; 65 this.components.download_btn = this.element.getElementsByClassName('btn_download nj-skinned')[0];
66 } 66 }
67 }, 67 },
68 //////////////////////////////////////////////////////////////////// 68 ////////////////////////////////////////////////////////////////////
69 // 69 //
70 willDraw: { 70 willDraw: {
71 enumerable: false, 71 enumerable: false,
72 value: function() { 72 value: function() {
73 // 73 //
74 if (navigator.appVersion.indexOf("Win")!=-1) { 74 if (navigator.appVersion.indexOf("Win")!=-1) {
75 this._os = 'windows'; 75 this._os = 'windows';
76 } else if (navigator.appVersion.indexOf("Mac")!=-1) { 76 } else if (navigator.appVersion.indexOf("Mac")!=-1) {
77 this._os = 'mac'; 77 this._os = 'mac';
78 } else { 78 } else {
79