aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel/components-panel.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-25 13:34:04 -0700
committerNivesh Rajbhandari2012-04-25 13:34:04 -0700
commit32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch)
treefbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/panels/components-panel.reel/components-panel.js
parent60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.js')
-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");