From 55f4835aa33546f5cd27e501ed461a0f7eb5038b Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 10:31:45 -0700
Subject: Undoing mistakes from auto-merge.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 assets/canvas-runtime.js                           |   8 -
 js/lib/geom/geom-obj.js                            | 358 ++++++++++-----------
 .../TimelinePanel.reel/css/TimelinePanel.css       |   4 +-
 js/panels/presets/default-animation-presets.js     |   2 -
 js/panels/presets/default-style-presets.js         |  11 +-
 js/panels/presets/default-transition-presets.js    |   8 -
 6 files changed, 187 insertions(+), 204 deletions(-)

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 2ca76962..7893786e 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -121,14 +121,6 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
 	// all "live" materials
 	this._materials = [];
 
-		// provide the mapping for the asset directory
-		if (assetPath)
-		{
-			this._assetPath = assetPath.slice();
-			if (this._assetPath[this._assetPath.length-1] != '/')
-				this._assetPath += '/';
-		}
-
 	if(this._assetPath !== undefined) {
 		RDGE.globals.engine.setAssetPath(this._assetPath);
 	}
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 56cf7c98..2cde8a75 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -1,8 +1,8 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-	this.GEOM_TYPE_RECTANGLE		=  1;
-	this.GEOM_TYPE_CIRCLE			=  2;
-	this.GEOM_TYPE_LINE             =  3;
-	this.GEOM_TYPE_PATH			    =  4;
-	this.GEOM_TYPE_CUBIC_BEZIER     =  5;
-    this.GEOM_TYPE_BRUSH_STROKE     =  6;
-	this.GEOM_TYPE_UNDEFINED		= -1;
+    this.GEOM_TYPE_RECTANGLE = 1;
+    this.GEOM_TYPE_CIRCLE = 2;
+    this.GEOM_TYPE_LINE = 3;
+    this.GEOM_TYPE_PATH = 4;
+    this.GEOM_TYPE_CUBIC_BEZIER = 5;
+    this.GEOM_TYPE_BRUSH_STROKE = 6;
+    this.GEOM_TYPE_UNDEFINED = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-	
+
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,74 +40,74 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor	= [0,0,0,0];
-    this._fillColor		= [0,0,0,0];
+    this._strokeColor = [0, 0, 0, 0];
+    this._fillColor = [0, 0, 0, 0];
 
-	// stroke and fill materials
-	this._fillMaterial = null;
-	this._strokeMaterial = null;
+    // stroke and fill materials
+    this._fillMaterial = null;
+    this._strokeMaterial = null;
 
-	// array of primitives - used in RDGE
-	this._primArray = [];
-	this._materialNodeArray = [];
-	this._materialArray = [];
-	this._materialTypeArray = [];
+    // array of primitives - used in RDGE
+    this._primArray = [];
+    this._materialNodeArray = [];
+    this._materialArray = [];
+    this._materialTypeArray = [];
 
-	// the transform node used by RDGE
-	this._trNode = null;
+    // the transform node used by RDGE
+    this._trNode = null;
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function( world ) {
+    this.setWorld = function (world) {
         this.m_world = world;
     };
 
-    this.getWorld = function() {
+    this.getWorld = function () {
         return this.m_world;
     };
 
-	this.getMatrix = function() {
+    this.getMatrix = function () {
         return this._matrix.slice(0);
     };
 
-	this.setMatrix = function(m) {
+    this.setMatrix = function (m) {
         this._matrix = m.slice(0);
     };
 
-    this.setNext = function( next ) {
+    this.setNext = function (next) {
         this._next = next;
     };
 
-    this.getNext = function() {
+    this.getNext = function () {
         return this._next;
     };
 
-    this.setPrev = function( prev ) {
+    this.setPrev = function (prev) {
         this._prev = prev;
     };
 
-    this.getPrev = function() {
+    this.getPrev = function () {
         return this._prev;
     };
 
-    this.setChild = function( child ) {
+    this.setChild = function (child) {
         this._child = child;
     };
 
-    this.getChild = function() {
+    this.getChild = function () {
         return this._child;
     };
 
-    this.setParent = function( parent ) {
+    this.setParent = function (parent) {
         this._parent = parent;
     };
 
-    this.getParent = function() {
+    this.getParent = function () {
         return this._parent;
     };
 
-	this.geomType = function() {
+    this.geomType = function () {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
@@ -115,7 +115,7 @@ var GeomObj = function GLGeomObj() {
         return this._primArray;
     };
 
-	this.getMaterialNodeArray = function() {
+    this.getMaterialNodeArray = function () {
         return this._materialNodeArray;
     };
 
@@ -123,29 +123,29 @@ var GeomObj = function GLGeomObj() {
         return this._materialArray;
     };
 
-	this.getTransformNode = function() {
+    this.getTransformNode = function () {
         return this._trNode;
     };
 
-	this.setTransformNode = function(t) {
+    this.setTransformNode = function (t) {
         this._trNode = t;
     };
 
-    this.setFillColor = function(c) {
+    this.setFillColor = function (c) {
         this.setMaterialColor(c, "fill");
     };
 
-    this.setStrokeColor = function(c) {
+    this.setStrokeColor = function (c) {
         this.setMaterialColor(c, "stroke");
     };
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	this.setMaterialColor = function(c, type) {
+    this.setMaterialColor = function (c, type) {
         var i = 0,
             nMats = 0;
-        if(c) {
-            if(c.gradientMode) {
+        if (c) {
+            if (c.gradientMode) {
                 // Gradient support
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
@@ -156,21 +156,21 @@ var GeomObj = function GLGeomObj() {
 
                 var len = colors.length;
                 // TODO - Current shaders only support 4 color stops
-                if(len > 4) {
+                if (len > 4) {
                     len = 4;
                 }
 
-                for(var n=0; n<len; n++) {
-                    var position = colors[n].position/100;
+                for (var n = 0; n < len; n++) {
+                    var position = colors[n].position / 100;
                     var cs = colors[n].value;
-                    var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                    var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a];
                     stops.push(stop);
 
                     if (nMats === this._materialTypeArray.length) {
-                        for (i=0;  i<nMats;  i++) {
+                        for (i = 0; i < nMats; i++) {
                             if (this._materialTypeArray[i] == type) {
-                                this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
-                                this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                                this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
+                                this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                             }
                         }
                     }
@@ -190,9 +190,9 @@ var GeomObj = function GLGeomObj() {
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
                     if (nMats === this._materialTypeArray.length) {
-                        for (i=0;  i<nMats;  i++) {
+                        for (i = 0; i < nMats; i++) {
                             if (this._materialTypeArray[i] == type) {
-                                this._materialArray[i].setProperty( "color", c.slice(0) );
+                                this._materialArray[i].setProperty("color", c.slice(0));
                             }
                         }
                     }
@@ -208,45 +208,45 @@ var GeomObj = function GLGeomObj() {
             if (this._materialArray && this._materialTypeArray) {
                 nMats = this._materialArray.length;
                 if (nMats === this._materialTypeArray.length) {
-                    for (i=0;  i<nMats;  i++) {
+                    for (i = 0; i < nMats; i++) {
                         if (this._materialTypeArray[i] == type) {
                             // TODO - Not sure how to set color to null values in shaders
-                            this._materialArray[i].setProperty( "color", [0,0,0,0] );
+                            this._materialArray[i].setProperty("color", [0, 0, 0, 0]);
                         }
                     }
                 }
             }
         }
 
-		var world = this.getWorld();
-		if (world)  {
+        var world = this.getWorld();
+        if (world) {
             world.restartRenderLoop();
         }
-	};
+    };
 
-    this.makeStrokeMaterial = function() {
+    this.makeStrokeMaterial = function () {
         var strokeMaterial;
-        if (this.getStrokeMaterial()){
+        if (this.getStrokeMaterial()) {
             strokeMaterial = this.getStrokeMaterial().dup();
         } else {
             strokeMaterial = MaterialsModel.exportFlatMaterial();
         }
 
         if (strokeMaterial) {
-            strokeMaterial.init( this.getWorld() );
+            strokeMaterial.init(this.getWorld());
         }
 
-        this._materialArray.push( strokeMaterial );
-        this._materialTypeArray.push( "stroke" );
+        this._materialArray.push(strokeMaterial);
+        this._materialTypeArray.push("stroke");
 
-        if(this._strokeColor) {
+        if (this._strokeColor) {
             this.setStrokeColor(this._strokeColor);
         }
 
         return strokeMaterial;
     };
 
-    this.makeFillMaterial = function() {
+    this.makeFillMaterial = function () {
         var fillMaterial;
         if (this.getFillMaterial()) {
             fillMaterial = this.getFillMaterial().dup();
@@ -255,11 +255,11 @@ var GeomObj = function GLGeomObj() {
         }
 
         if (fillMaterial) {
-            fillMaterial.init( this.getWorld() );
+            fillMaterial.init(this.getWorld());
         }
 
-        this._materialArray.push( fillMaterial );
-        this._materialTypeArray.push( "fill" );
+        this._materialArray.push(fillMaterial);
+        this._materialTypeArray.push("fill");
 
         if (this._fillColor) {
             this.setFillColor(this._fillColor);
@@ -269,159 +269,159 @@ var GeomObj = function GLGeomObj() {
     };
 
     this.exportMaterialsJSON = function () {
-		var jObj;
+        var jObj;
         if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
-			var nMats = this._materialArray.length;
+            var nMats = this._materialArray.length;
             if (nMats > 0) {
-				var arr = [];
+                var arr = [];
 
                 for (var i = 0; i < nMats; i++) {
-					var matObj = 
-					{
-						'materialNodeName'	: this._materialNodeArray[i].name,
-						'material'			: this._materialArray[i].exportJSON(),
-						'type'				: this._materialTypeArray[i]
-					}
-					arr.push( matObj );
-				}
-
-				jObj =
-				{
-					'nMaterials'	: nMats,
-					'materials'		: arr
-				};
-			}
-		}
-
-		return jObj;
-	}
+                    var matObj =
+                    {
+                        'materialNodeName':this._materialNodeArray[i].name,
+                        'material':this._materialArray[i].exportJSON(),
+                        'type':this._materialTypeArray[i]
+                    }
+                    arr.push(matObj);
+                }
+
+                jObj =
+                {
+                    'nMaterials':nMats,
+                    'materials':arr
+                };
+            }
+        }
+
+        return jObj;
+    }
 
     this.importMaterialsJSON = function (jObj) {
-		this._materialArray = [];
-		this._materialTypeArray = [];
+        this._materialArray = [];
+        this._materialTypeArray = [];
 
-		if (!jObj)  return;
+        if (!jObj)  return;
 
-		var nMaterials = jObj.nMaterials;
-		var matArray = jObj.materials;
+        var nMaterials = jObj.nMaterials;
+        var matArray = jObj.materials;
         for (var i = 0; i < nMaterials; i++) {
-			var mat;
-			var matObj = matArray[i].material;
-			var shaderName = matObj.material;
+            var mat;
+            var matObj = matArray[i].material;
+            var shaderName = matObj.material;
             switch (shaderName) {
-				case "flat":
-				case "radialGradient":
-				case "linearGradient":
-				case "bumpMetal":
-				case "uber":
-				case "plasma":
-				case "deform":
-				case "water":
-				case "paris":
-				case "raiders":
-				case "tunnel":
-				case "reliefTunnel":
-				case "squareTunnel":
-				case "twist":
-				case "fly":
-				case "julia":
-				case "mandel":
-				case "star":
-				case "zinvert":
-				case "keleidoscope":
-				case "radialBlur":
-				case "pulse":
-					mat = MaterialsModel.getMaterialByShader( shaderName );
-					if (mat)  mat = mat.dup();
-					break;
-
-				default:
-					console.log( "material type: " + shaderName + " is not supported" );
-					break;
-			}
+                case "flat":
+                case "radialGradient":
+                case "linearGradient":
+                case "bumpMetal":
+                case "uber":
+                case "plasma":
+                case "deform":
+                case "water":
+                case "paris":
+                case "raiders":
+                case "tunnel":
+                case "reliefTunnel":
+                case "squareTunnel":
+                case "twist":
+                case "fly":
+                case "julia":
+                case "mandel":
+                case "star":
+                case "zinvert":
+                case "keleidoscope":
+                case "radialBlur":
+                case "pulse":
+                    mat = MaterialsModel.getMaterialByShader(shaderName);
+                    if (mat)  mat = mat.dup();
+                    break;
+
+                default:
+                    console.log("material type: " + shaderName + " is not supported");
+                    break;
+            }
 
             if (mat) {
-				mat.importJSON( matObj );
-				this._materialArray.push( mat );
-				this._materialTypeArray.push( matObj.type );
-				var type = matArray[i].type;
-				if (type == "fill")  this._fillMaterial = mat;
-				else  this._strokeMaterial = mat;
-			}
-		}
-    };
-
-    this.translate   = function(v) {
-        var mat = Matrix.Translation( v );
+                mat.importJSON(matObj);
+                this._materialArray.push(mat);
+                this._materialTypeArray.push(matObj.type);
+                var type = matArray[i].type;
+                if (type == "fill")  this._fillMaterial = mat;
+                else  this._strokeMaterial = mat;
+            }
+        }
+    };
+
+    this.translate = function (v) {
+        var mat = Matrix.Translation(v);
         //var mat2 = mat.multiply( this._matrix );
         //this._matrix = mat2;
-		glmat4.multiply(mat, this._matrix, this._matrix);
+        glmat4.multiply(mat, this._matrix, this._matrix);
     };
 
-    this.transform  = function( mat ) {
+    this.transform = function (mat) {
         if (mat) {
             //this._matrix = mat.multiply( this._matrix );
-			glmat4.multiply(mat, this._matrix, this._matrix);
-		}
+            glmat4.multiply(mat, this._matrix, this._matrix);
+        }
     };
 
-    this.setMatrix  = function(mat) {
+    this.setMatrix = function (mat) {
         var gl = this.getWorld().getGLContext();
         if (gl) {
             gl.uniformMatrix4fv(this.getWorld().getShaderProgram().mvMatrixUniform, false, new Float32Array(mat));
         }
     };
 
-    this.buildBuffers = function() {
+    this.buildBuffers = function () {
         // this function must be overridden by the base class
-        alert( "GLGeomObj.buildBuffers must be overridden by base class" );
+        alert("GLGeomObj.buildBuffers must be overridden by base class");
     };
 
-    this.render = function() {
-        alert( "GLGeomObj.render method must be overridden by sub class" );
+    this.render = function () {
+        alert("GLGeomObj.render method must be overridden by sub class");
     };
 
-    this.collidesWithPoint = function( x, y ) {
-        alert( "GLGeomObj.collidesWithPoint method must be overridden by sub class" );
+    this.collidesWithPoint = function (x, y) {
+        alert("GLGeomObj.collidesWithPoint method must be overridden by sub class");
     };
 
-    this.getNearPoint = function( pt, dir ) {
-		// the alert is not displayed.  Objects may choose not to implement this method.
+    this.getNearPoint = function (pt, dir) {
+        // the alert is not displayed.  Objects may choose not to implement this method.
         //alert( "GLGeomObj.getNearPoint method must be overridden by sub class" );
     };
 
-	this.getNearVertex = function( pt, dir ) {
-		// this should be overridden by objects (such as rectangles) that have corners
-	};
+    this.getNearVertex = function (pt, dir) {
+        // this should be overridden by objects (such as rectangles) that have corners
+    };
 
-    this.containsPoint = function( pt, dir ) {
-		// the alert is not displayed.  Objects may choose not to implement this method.
+    this.containsPoint = function (pt, dir) {
+        // the alert is not displayed.  Objects may choose not to implement this method.
         //alert( "GLGeomObj.containsPoint method must be overridden by sub class" );
     };
 
-	this.getPropertyFromString = function( prop, str ) {
-		var index = str.indexOf( prop );
-		if (index < 0)  throw new Error( "property " + prop + " not found in string: " + str);
+    this.getPropertyFromString = function (prop, str) {
+        var index = str.indexOf(prop);
+        if (index < 0)  throw new Error("property " + prop + " not found in string: " + str);
 
-		var rtnStr = str.substr( index+prop.length );
-		index = rtnStr.indexOf( "\n" );
-		if (index >= 0) {
-			rtnStr = rtnStr.substr(0, index);
+        var rtnStr = str.substr(index + prop.length);
+        index = rtnStr.indexOf("\n");
+        if (index >= 0) {
+            rtnStr = rtnStr.substr(0, index);
         }
 
-		return rtnStr;
-	};
+        return rtnStr;
+    };
 
     // Gradient stops for rgba(255,0,0,1) at 0%; rgba(0,255,0,1) at 33%; rgba(0,0,255,1) at 100% will return
     // 255,0,0,1@0;0,255,0,1@33;0,0,255,1@100
-    this.gradientToString = function(colors) {
+    this.gradientToString = function (colors) {
         var rtnStr = "";
-        if(colors && colors.length) {
-                var c = colors[0],
+        if (colors && colors.length) {
+            var c = colors[0],
                 len = colors.length;
 
             rtnStr += String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
-            for(var i=1; i<len; i++) {
+            for (var i = 1; i < len; i++) {
                 c = colors[i];
                 rtnStr += ";" + String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
             }
@@ -434,7 +434,7 @@ var GeomObj = function GLGeomObj() {
     //               {position:33, value:{r:0, g:255, b:0, a:1}},
     //               {position:100, value:{r:0, g:0, b:255, a:1}}
     //             ]
-    this.stringToGradient = function(gradientStr) {
+    this.stringToGradient = function (gradientStr) {
         var rtnArr = [];
 
         var i,
@@ -448,18 +448,18 @@ var GeomObj = function GLGeomObj() {
         for (i = 0; i < len; i++) {
             stop = stops[i].split("@");
             c = stop[0].split(",");
-            rtnArr.push({ position: Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });
+            rtnArr.push({ position:Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });
         }
 
         return rtnArr;
     };
 
     /*
-    this.export = function() {
-		var rtnStr;
-		return rtnStr;
-    }
-    */
+     this.export = function() {
+     var rtnStr;
+     return rtnStr;
+     }
+     */
 };
 
 if (typeof exports === "object") {
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 129b9771..ca6fe6fd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -10,12 +10,12 @@
     height: 100%;
 }
 .maintimeline{
-    border-style: double;
     -webkit-box-flex: 1;
     display: -webkit-box;
-    -webkit-box-orient: horizontal
+    -webkit-box-orient: horizontal;
     height : 100%;
     position: relative;
+    margin-top: 1px;
 }
 .leftinside{
     height: 100%;
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 4793c356..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {
                 "text": "Border Morph",
                 "selectorBase" : "border-morph",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-animation-name": "border-morph",
                         "-webkit-animation-duration": "2s",
@@ -93,7 +92,6 @@ exports.animationPresets = {
                 "text": "Rotater",
                 "selectorBase" : "rotate-with-alpha-keyframes",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-animation-name": "rotate-with-alpha-keyframes",
                         "-webkit-animation-duration": "5s",
diff --git a/js/panels/presets/default-style-presets.js b/js/panels/presets/default-style-presets.js
index 82bec34f..10b24ff4 100644
--- a/js/panels/presets/default-style-presets.js
+++ b/js/panels/presets/default-style-presets.js
@@ -11,9 +11,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Border-Radius",
+                "id": "njBorderRadius",
                 "selectorBase" : "border-radius-preset",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "border-radius": "100px",
                         "border" : "1px solid #333"
@@ -22,9 +22,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Drop Shadow",
+                "id": "njDropShadow",
                 "selectorBase" : "drop-shadow",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "box-shadow": "2px 2px 50px rgba(0,0,0,0.5)",
                         "border" : "1px solid #CCC"
@@ -33,9 +33,10 @@ exports.stylePresets = {
             },
             {
                 "text": "Fancy Box",
+                "id": "njFancyBox",
                 "selectorBase" : "fancy-box",
                 "rules" : [{
-                    "selectorSuffix" : "",
+                    "selectorSuffix": "",
                     "styles" : {
                         "box-shadow": "inset 0 0 0 1px #666, inset 0 0 0 2px rgba(225, 225, 225, 0.4), 0 0 20px -10px #333",
                         "border" : "1px solid #FFF",
@@ -50,9 +51,9 @@ exports.stylePresets = {
         "children": [
             {
                 "text": "Italic",
+                "id": "njItalic",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "font-style": "italic"
                     }
@@ -60,9 +61,9 @@ exports.stylePresets = {
             },
             {
                 "text": "Text Shadow",
+                "id": "njTextShadow",
                 "selectorBase" : "italicize",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "text-shadow": "1px 1px 3px #333"
                     }
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 15f4882f..f8968085 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -13,7 +13,6 @@ exports.transitionPresets = {
                 "text": "Fade In",
                 "selectorBase" : "fade-in",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "0.25",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -29,7 +28,6 @@ exports.transitionPresets = {
                 "text": "Fade Out",
                 "selectorBase" : "fade-out",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "opacity": "1",
                         "-webkit-transition": "all 0.4s ease-in"
@@ -48,7 +46,6 @@ exports.transitionPresets = {
                 "text": "Slide Right",
                 "selectorBase" : "slide-right",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -63,7 +60,6 @@ exports.transitionPresets = {
                 "text": "Slide Left",
                 "selectorBase" : "slide-left",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -78,7 +74,6 @@ exports.transitionPresets = {
                 "text": "Rotate",
                 "selectorBase" : "rotate",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
@@ -92,7 +87,6 @@ exports.transitionPresets = {
                 "text": "Scale Up",
                 "selectorBase" : "scale-up",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "-webkit-transform 0.4s ease-in"
                     }
@@ -107,7 +101,6 @@ exports.transitionPresets = {
                 "text": "Scale Down",
                 "selectorBase" : "scale-down",
                 "rules" : [{
-                    "selectorSuffix" : "",
                     "styles" : {
                         "-webkit-transition": "-webkit-transform 0.4s ease-in"
                     }
@@ -122,7 +115,6 @@ exports.transitionPresets = {
                 "text": "Remove 3D",
                 "selectorBase" : "remove-3d",
                 "rules" : [{
-                    "selectorSuffix": "",
                     "styles" : {
                         "-webkit-transition": "all 0.4s ease-in"
                     }
-- 
cgit v1.2.3