Fixes settings update.

editor/editor.php

@@ -29,10 +29,10 @@ if (isset($_GET['key'])) {
 	<script type="text/javascript" src="/Mergely/editor/editor.js"></script>
     <link type='text/css' rel='stylesheet' href='/Mergely/editor/editor.css' />
 
-    <!--
 	<script type="text/javascript" src="/Mergely/lib/mergely.min.js"></script>
-    -->
+    <!--
 	<script type="text/javascript" src="/Mergely/lib/mergely.js"></script>
+    -->
 	<link type="text/css" rel="stylesheet" href="/Mergely/lib/mergely.css" />
 	<script type="text/javascript" src="/Mergely/lib/codemirror.min.js"></script>
 	<script type="text/javascript" src="/Mergely/lib/searchcursor.js"></script>

lib/mergely.js

@@ -494,11 +494,11 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 	options: function(opts) {
 		if (opts) {
 			jQuery.extend(this.settings, opts);
-			if (opts.autoresize) this.resize();
-			if (opts.autoupdate || opts.ignorews) this.update();
-			if (opts.hasOwnProperty('rhs_margin')) {
+			if (this.settings.autoresize) this.resize();
+			if (this.settings.autoupdate) this.update();
+			if (this.settings.hasOwnProperty('rhs_margin')) {
 				// dynamically swap the margin
-				if (opts.rhs_margin == 'left') {
+				if (this.settings.rhs_margin == 'left') {
 					this.element.find('.mergely-margin:last-child').insertAfter(
 						this.element.find('.mergely-canvas'));
 				}
@@ -507,9 +507,9 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 					target.appendTo(target.parent());
 				}
 			}
-			if (opts.hasOwnProperty('sidebar')) {
+			if (this.settings.hasOwnProperty('sidebar')) {
 				// dynamically enable sidebars
-				if (opts.sidebar) {
+				if (this.settings.sidebar) {
 					jQuery(this.element).find('.mergely-margin').css({display: 'block'});
 				}
 				else {