aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
diff options
context:
space:
mode:
authorhwc4872012-04-19 13:01:43 -0700
committerhwc4872012-04-19 13:01:43 -0700
commite6a20fe64574763483dc602bd759278ccf5e5e68 (patch)
tree69defe7200206f0257fe90697136fadef59d521e /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
parentae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff)
parent9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff)
downloadninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index 0c950ffd..2a3fc068 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -520,9 +520,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
520 this.inComputedStyleMode = false; // No computed styles mode for multiple items 520 this.inComputedStyleMode = false; // No computed styles mode for multiple items
521 521
522 ///// if multiple items are selected, then show common rules 522 ///// if multiple items are selected, then show common rules
523 var elements = items.map(function(item) { 523 var elements = Array.prototype.slice.call(this.application.ninja.selectedElements, 0);
524 return item._element;
525 });
526 524
527 ///// show toolbar, but hide computed style button 525 ///// show toolbar, but hide computed style button
528 this.sections.styles.toolbar.style.display = ''; 526 this.sections.styles.toolbar.style.display = '';
@@ -538,7 +536,7 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
538 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide'); 536 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide');
539 this.sections.styles.showComputedEl.classList.remove('nj-css-panel-hide');// .style.display = ''; 537 this.sections.styles.showComputedEl.classList.remove('nj-css-panel-hide');// .style.display = '';
540 this.sections.styles.toolbar.style.display = ''; 538 this.sections.styles.toolbar.style.display = '';
541 this.showStylesForElement(items[0]._element, null); 539 this.showStylesForElement(items[0], null);
542 } else { 540 } else {
543 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide'); 541 this.sections.styles.statusMsg.classList.add('nj-css-panel-hide');
544 this._inMultiSelectMode = false; 542 this._inMultiSelectMode = false;
@@ -1691,7 +1689,7 @@ NJCSSStyle.prototype.styleChange = function() {
1691NJCSSStyle.prototype.getUnits = function(val) { 1689NJCSSStyle.prototype.getUnits = function(val) {
1692 if(val.split(/\s/).length > 1) { 1690 if(val.split(/\s/).length > 1) {
1693 return false; 1691 return false;
1694 } else if(/px|em|pt|in|cm|mm|ex|pc|%/.test(val)) { 1692 } else if(/(px|em|pt|in|cm|mm|ex|pc|%)$/.test(val)) {
1695 return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1'); 1693 return val.replace(/^.*(px|em|pt|in|cm|mm|ex|pc|%).*/, '$1');
1696 } 1694 }
1697 return null; 1695 return null;
@@ -1771,7 +1769,7 @@ NJCSSStyle.prototype.updateValue = function(newValue, bypassUndo) {
1771 this.styleChange(); 1769 this.styleChange();
1772 return true; 1770 return true;
1773 } 1771 }
1774 1772
1775 var IMPORTANT_FLAG = ' !important', 1773 var IMPORTANT_FLAG = ' !important',
1776 dec = this.njRule.declaration, 1774 dec = this.njRule.declaration,
1777 acceptAsValid = false, 1775 acceptAsValid = false,