aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-24 10:06:53 -0700
committerJose Antonio Marquez2012-04-24 10:06:53 -0700
commit4c15e77bdb7f4e0558f3749994a8a37b207b97ae (patch)
tree593ab4917fb5cc3ef8ee36822b56c6edd30c33a5 /js/panels/components-panel.reel
parent36d50b6599ab98559c76e1fe57b1bb131c4433da (diff)
parent55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
downloadninja-4c15e77bdb7f4e0558f3749994a8a37b207b97ae.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/components-panel.reel')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index acbf702f..79eac37b 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -8,7 +8,6 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 NJUtils = require("js/lib/NJUtils").NJUtils; 9 NJUtils = require("js/lib/NJUtils").NJUtils;
10 10
11var treeControlModule = require("js/components/tree.reel");
12var PIData = require("js/data/pi/pi-data").PiData; 11var PIData = require("js/data/pi/pi-data").PiData;
13 12
14String.prototype.capitalizeFirstChar = function() { 13String.prototype.capitalizeFirstChar = function() {
@@ -286,9 +285,7 @@ exports.ComponentsPanel = Montage.create(Component, {
286 var styles = { 285 var styles = {
287 'position': 'absolute', 286 'position': 'absolute',
288 'left' : that.dragPosition[0] + 'px', 287 'left' : that.dragPosition[0] + 'px',
289 'top' : that.dragPosition[1] + 'px', 288 'top' : that.dragPosition[1] + 'px'
290 '-webkit-transform-style' : 'preserve-3d',
291 '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
292 }; 289 };
293 290
294 var defaultStyles = component.defaultStyles; 291 var defaultStyles = component.defaultStyles;
@@ -369,7 +366,7 @@ exports.ComponentsPanel = Montage.create(Component, {
369 break; 366 break;
370 case "textarea": 367 case "textarea":
371 el = NJUtils.makeNJElement("textarea", "TextArea", "component"); 368 el = NJUtils.makeNJElement("textarea", "TextArea", "component");
372 el.elementModel.pi = "TextAreaPi"; 369 el.elementModel.pi = "TextareaPi";
373 break; 370 break;
374 case "toggleButton": 371 case "toggleButton":
375 el = NJUtils.makeNJElement("button", "Toggle Button", "component"); 372 el = NJUtils.makeNJElement("button", "Toggle Button", "component");