Merge branch 'erikpena-patch-2'

douglasduteil · douglasduteil · commit 38c6bfb85814 · 2015-01-08T03:06:25.000+01:00
diff --git a/src/ui-ace.js b/src/ui-ace.js
@@ -58,6 +58,9 @@ angular.module('ui.ace', [])
       if (angular.isDefined(opts.useSoftTabs)) {
         session.setUseSoftTabs(opts.useSoftTabs);
       }
+      if (angular.isDefined(opts.showPrintMargin)) {
+        acee.setShowPrintMargin(opts.showPrintMargin);
+      }
 
       // commands
       if (angular.isDefined(opts.disableSearch) && opts.disableSearch) {

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ angular.module('ui.ace', [])`
`58`	`58`	`if (angular.isDefined(opts.useSoftTabs)) {`
`59`	`59`	`session.setUseSoftTabs(opts.useSoftTabs);`
`60`	`60`	`}`
	`61`	`+ if (angular.isDefined(opts.showPrintMargin)) {`
	`62`	`+ acee.setShowPrintMargin(opts.showPrintMargin);`
	`63`	`+ }`
`61`	`64`
`62`	`65`	`// commands`
`63`	`66`	`if (angular.isDefined(opts.disableSearch) && opts.disableSearch) {`