Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/lib/NJUtils.js

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
index a132b0ab..13ba0518 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
@@ -318,7 +318,7 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
 
             if (slotElem) {
                 if (slotElem.parentNode) {
-                    slotElem.parentNode.removeChild(slotElem)
+                    slotElem.parentNode.removeChild(slotElem);
                 }
                 this._activeOverlay = null;
                 slot.content = null;
@@ -643,7 +643,7 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
         value: function() {
             var thisRef = this,
                 prevValue;
-                updateValues = function() {
+                var updateValues = function() {
                     clearTimeout(thisRef._forceUpdateValuesTimeout);
                     delete thisRef._forceUpdateValuesTimeout;
                     clearTimeout(thisRef._updateValuesTimeout);