diff options
35 files changed, 394 insertions, 344 deletions
diff --git a/css/ninja.css b/css/ninja.css index ce27977b..e3d560ab 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -909,7 +909,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
909 | 909 | ||
910 | ::-webkit-scrollbar-track:disabled { display: none; } | 910 | ::-webkit-scrollbar-track:disabled { display: none; } |
911 | 911 | ||
912 | :-webkit-scrollbar-track:vertical:disabled { display: none; } | 912 | ::-webkit-scrollbar-track:vertical:disabled { display: none; } |
913 | 913 | ||
914 | ::-webkit-scrollbar-track:horizontal:disabled { display: none; } | 914 | ::-webkit-scrollbar-track:horizontal:disabled { display: none; } |
915 | 915 | ||
@@ -919,18 +919,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
919 | 919 | ||
920 | ::-webkit-scrollbar-corner:disabled { display: none; } | 920 | ::-webkit-scrollbar-corner:disabled { display: none; } |
921 | 921 | ||
922 | #iframeContainer::-webkit-resizer:disabled { display: block; } | ||
923 | |||
924 | #iframeContainer::-webkit-scrollbar-track:vertical:disabled { display: block; } | ||
925 | |||
926 | #iframeContainer::-webkit-scrollbar-track:horizontal:disabled { display: block; } | ||
927 | |||
928 | #iframeContainer::-webkit-scrollbar-track-piece:disabled { display: block; } | ||
929 | |||
930 | #iframeContainer::-webkit-scrollbar-corner:disabled { display: block; } | ||
931 | |||
932 | #iframeContainer::-webkit-resizer:disabled { display: block; } | ||
933 | |||
934 | .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } | 922 | .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } |
935 | 923 | ||
936 | .tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; } | 924 | .tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; } |
diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js index 6b97d5c5..9f6e4112 100644 --- a/js/components/converter/string-units-converter.js +++ b/js/components/converter/string-units-converter.js | |||
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage, | |||
9 | 9 | ||
10 | exports.StringUnitsConverter = Montage.create(Converter, { | 10 | exports.StringUnitsConverter = Montage.create(Converter, { |
11 | 11 | ||
12 | // convert fahrenheit to celsius (showing our non-metric heritage here) | ||
13 | convert: { | 12 | convert: { |
14 | value: function(value) { | 13 | value: function(value) { |
15 | if(value) { | 14 | if(value) { |
@@ -20,7 +19,6 @@ exports.StringUnitsConverter = Montage.create(Converter, { | |||
20 | } | 19 | } |
21 | }, | 20 | }, |
22 | 21 | ||
23 | // revert celsius to fahrenheit | ||
24 | revert: { | 22 | revert: { |
25 | value: function(value) { | 23 | value: function(value) { |
26 | console.log("revert string to unit ", value); | 24 | console.log("revert string to unit ", value); |
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js index 28d7dd29..f397f731 100644 --- a/js/components/converter/string-value-converter.js +++ b/js/components/converter/string-value-converter.js | |||
@@ -9,7 +9,6 @@ var Montage = require("montage").Montage, | |||
9 | 9 | ||
10 | exports.StringValueConverter = Montage.create(Converter, { | 10 | exports.StringValueConverter = Montage.create(Converter, { |
11 | 11 | ||
12 | // convert fahrenheit to celsius (showing our non-metric heritage here) | ||
13 | convert: { | 12 | convert: { |
14 | value: function(value) { | 13 | value: function(value) { |
15 | console.log(value); | 14 | console.log(value); |
@@ -18,7 +17,6 @@ exports.StringValueConverter = Montage.create(Converter, { | |||
18 | } | 17 | } |
19 | }, | 18 | }, |
20 | 19 | ||
21 | // revert celsius to fahrenheit | ||
22 | revert: { | 20 | revert: { |
23 | value: function(value) { | 21 | value: function(value) { |
24 | console.log("revert string to value ", value); | 22 | console.log("revert string to value ", value); |
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 7a3a66f5..0dc11b82 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -30,7 +30,8 @@ exports.BodyController = Montage.create(ElementController, { | |||
30 | value: function(el, p) { | 30 | value: function(el, p) { |
31 | switch(p) { | 31 | switch(p) { |
32 | case "background" : | 32 | case "background" : |
33 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true)); | 33 | case "background-color": |
34 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color")); | ||
34 | case "border": | 35 | case "border": |
35 | return 0; | 36 | return 0; |
36 | case "height": | 37 | case "height": |
@@ -47,8 +48,8 @@ exports.BodyController = Montage.create(ElementController, { | |||
47 | setProperty: { | 48 | setProperty: { |
48 | value: function(el, p, value) { | 49 | value: function(el, p, value) { |
49 | switch(p) { | 50 | switch(p) { |
50 | case "body-background": | ||
51 | case "background": | 51 | case "background": |
52 | case "background-color": | ||
52 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); | 53 | this.application.ninja.stylesController.setElementStyle(el, "background-color", value); |
53 | break; | 54 | break; |
54 | case "overflow": | 55 | case "overflow": |
@@ -71,7 +72,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
71 | 72 | ||
72 | getPerspectiveDist: { | 73 | getPerspectiveDist: { |
73 | value: function(el) { | 74 | value: function(el) { |
74 | if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) { | 75 | if(el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) { |
75 | return el.elementModel.props3D.perspectiveDist; | 76 | return el.elementModel.props3D.perspectiveDist; |
76 | } else { | 77 | } else { |
77 | var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true); | 78 | var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true); |
@@ -83,7 +84,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
83 | 84 | ||
84 | getMatrix: { | 85 | getMatrix: { |
85 | value: function(el) { | 86 | value: function(el) { |
86 | if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.matrix3d) | 87 | if(el.elementModel.props3D && el.elementModel.props3D.matrix3d) |
87 | { | 88 | { |
88 | return el.elementModel.props3D.matrix3d.slice(0); | 89 | return el.elementModel.props3D.matrix3d.slice(0); |
89 | } | 90 | } |
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js index 3ac3fe14..2d2a5cd1 100755 --- a/js/controllers/elements/controller-factory.js +++ b/js/controllers/elements/controller-factory.js | |||
@@ -8,7 +8,6 @@ var Montage = require("montage/core/core").Montage; | |||
8 | 8 | ||
9 | var BodyController = require("js/controllers/elements/body-controller").BodyController, | 9 | var BodyController = require("js/controllers/elements/body-controller").BodyController, |
10 | BlockController = require("js/controllers/elements/block-controller").BlockController, | 10 | BlockController = require("js/controllers/elements/block-controller").BlockController, |
11 | StageController = require("js/controllers/elements/stage-controller").StageController, | ||
12 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, | 11 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, |
13 | ImageController = require("js/controllers/elements/image-controller").ImageController, | 12 | ImageController = require("js/controllers/elements/image-controller").ImageController, |
14 | VideoController = require("js/controllers/elements/video-controller").VideoController, | 13 | VideoController = require("js/controllers/elements/video-controller").VideoController, |
@@ -27,7 +26,8 @@ exports.ControllerFactory = Montage.create(Montage, { | |||
27 | if(value.indexOf("block") !== -1) { | 26 | if(value.indexOf("block") !== -1) { |
28 | return BlockController; | 27 | return BlockController; |
29 | } else if(value.indexOf("stage") !== -1) { | 28 | } else if(value.indexOf("stage") !== -1) { |
30 | return StageController; | 29 | // return StageController; |
30 | alert("Calling the stage controller. Should not be calling this object"); | ||
31 | } else if(value.indexOf("body") !== -1) { | 31 | } else if(value.indexOf("body") !== -1) { |
32 | return BodyController; | 32 | return BodyController; |
33 | } else if(value.indexOf("shape") !== -1) { | 33 | } else if(value.indexOf("shape") !== -1) { |
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 941e05ba..4a02e9a3 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -37,7 +37,7 @@ exports.ElementController = Montage.create(Component, { | |||
37 | // Remove the element from the DOM and clear the GLWord. | 37 | // Remove the element from the DOM and clear the GLWord. |
38 | removeElement: { | 38 | removeElement: { |
39 |