Merge branch 'danfinnie-master'

Author: douglasduteil

README.md

@@ -112,6 +112,16 @@ This will copy the UI.Ace files into a `bower_components` folder, along with its
 }"></div>
 ```
 
+To include options applicable to the ACE renderer, you can use the `rendererOptions` key:
+
+```html
+<div ui-ace="{
+  rendererOptions: {
+      maxLinks: Infinity
+  }
+}"></div>
+```
+
 ## Support for concatenated bundles
 
 Trying to use ace with concatenated javascript files usually fails because it changes the physical location of the `workerPath`. If you

src/ui-ace.js

@@ -98,14 +98,25 @@ angular.module('ui.ace', [])
       }
 
       // advanced options
+      var key, obj;
       if (angular.isDefined(opts.advanced)) {
-          for (var key in opts.advanced) {
+          for (key in opts.advanced) {
               // create a javascript object with the key and value
-              var obj = { name: key, value: opts.advanced[key] };
+              obj = { name: key, value: opts.advanced[key] };
               // try to assign the option to the ace editor
               acee.setOption(obj.name, obj.value);
           }
       }
+
+      // advanced options for the renderer
+      if (angular.isDefined(opts.rendererOptions)) {
+          for (key in opts.rendererOptions) {
+              // create a javascript object with the key and value
+              obj = { name: key, value: opts.rendererOptions[key] };
+              // try to assign the option to the ace editor
+              acee.renderer.setOption(obj.name, obj.value);
+          }
+      }
     };
 
     return {

test/ace.spec.js

@@ -80,6 +80,9 @@ describe('uiAce', function () {
           _ace.setOption = jasmine
             .createSpy('ace.setOption')
             .and.callThrough();
+          _ace.renderer.setOption = jasmine
+            .createSpy('ace.setOption')
+            .and.callThrough();
           return _ace;
         });
     });
@@ -88,16 +91,23 @@ describe('uiAce', function () {
       window.ace.edit = aceEditFunction;
     });
 
-    it('Given advanced option is null if not defined.', function () {
+    it('should not trigger ace#setOption.', function () {
       $compile('<div ui-ace>')(scope);
       expect(_ace.setOption.calls.count()).toEqual(0);
     });
 
-    it('given advanced options are properly defined.', function () {
-      $compile('<div ui-ace=\'{ advanced: { enableSnippets: true  } }\'>')(scope);
+    it('should trigger ace#setOption with "advanced" options.', function () {
+      $compile('<div ui-ace=\'{ advanced: { enableSnippets: true } }\'>')(scope);
       expect(_ace.setOption.calls.count()).toEqual(1);
       expect(_ace.setOption).toHaveBeenCalledWith('enableSnippets', true);
     });
+
+    it('should trigger renderer#setOption with "rendererOptions" options.', function () {
+      $compile('<div ui-ace=\'{ rendererOptions: { maxLines: 42 } }\'>')(scope);
+      expect(_ace.renderer.setOption.calls.count()).toEqual(2);
+      expect(_ace.renderer.setOption).toHaveBeenCalledWith('showGutter', false);
+      expect(_ace.renderer.setOption).toHaveBeenCalledWith('maxLines', 42);
+    });
   });
 
   describe('basic behavior', function () {