material_raingular-ace 0.0.2.alpha → 0.0.3.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c3e091965542e4c713fc22b624df3ffbb22147
-  data.tar.gz: d4e2dce864d3cff414dc63ec0e478dac704be59a
+  metadata.gz: 145c26761fe98f3ea59b6fc7081ad306eeb49692
+  data.tar.gz: df31cfc7bc874828d226147c9cf36b3388cd2760
 SHA512:
-  metadata.gz: b9776f770cdf678c98a91bcbf29e3baf13f495ecc0595810b6b7660a156cbeb3d352a3d99bb9454a225bb5262eaaa4f4754c54f94387a81035262859db26c0b3
-  data.tar.gz: a2179bb4118415793e15a7d77a797a34c5ba56c155f24bc643b6bf80bb059161e7b9423631900f8db08642a4b4a0c6572fffe62420beb6e7915ef46eb1b6c1a4
+  metadata.gz: 5d2a7eb070b4598d6449c7417306055a05d442a68335e918946da21502801a692bb1e1c17e6348929d753c9faace79c7ccd0479dc95b5bc49d9a3e1c3a49ea1c
+  data.tar.gz: 87a98fd2e4a92fe29ea889363f13c17e73f783a94160d37d8f3ff5dbbb710980bf281040d09a598654aa5dba1404ab83b1df8d19c7c0703b69d53640387c0e4e

data/lib/assets/javascripts/code-editor.coffee

@@ -1,6 +1,32 @@
 # //= require ace/theme-monokai
 # //= require ace/mode-ruby
 # In order to have digested assets function properly, theme and mode must be required up front
+class EditorHeight
+  constructor: (scope,element,attributes)->
+    @scope      = scope
+    @element    = element
+    @attributes = attributes
+
+  minHeight: ->
+    heights = []
+    e = @element[0].parentElement.parentElement
+    while e
+      heights.push(e.offsetHeight) unless e.offsetHeight == 0
+      e = e.parentElement
+
+  height: ->
+    return @minHeight() + 'px' unless @attributes.editorSize
+    raw_equation = @attributes.editorSize.replace /[\+\-\/\*]/g, (operator)->
+      return " " + operator + " "
+    equation = []
+    for el in raw_equation.split(/\s+/)
+      unless el.match(/(^[\d+]?[.]?[\d+]$)|[\+\-\/\*]/)
+        method = 'getElement' + if el[0] == "#" then 'ById' else 'sByClass'
+        equation.push document[method](el[1..-1]).offsetHeight
+      else
+        equation.push(el)
+    return @scope.$eval(equation.join(' ')) + 'px'
+
 angular.module('materialRaingularAce', [])
   .directive 'codeEditor', ($timeout, factoryName, $injector)->
     restrict: 'E'
@@ -9,23 +35,24 @@ angular.module('materialRaingularAce', [])
     template: (element,attributes) ->
       websocketHelper = ->
         if typeof attributes.webSocket == 'undefined' then 'update' else 'model'
-      '<span><div id="process-code-editor"></div><input type="hidden" ng-' + websocketHelper + '="' + attributes.ngModel + '"</span>'
+      id = attributes['editorId'] || attributes.ngModel.replace('.','-') + "-code-editor"
+      '<span><div id="' + id + '"></div><input type="hidden" ng-' + websocketHelper + '="' + attributes.ngModel + '"</span>'
     link: (scope, element, attributes, modelCtrl)->
-      editor = ace.edit("process-code-editor")
+      id = attributes['editorId'] || attributes.ngModel.replace('.','-') + "-code-editor"
+      angular.ace = {} unless angular.ace
+      editor = ace.edit(id)
       editor.setTheme("ace/theme/monokai")
       editor.getSession().setMode("ace/mode/ruby")
       editor.getSession().setTabSize(2)
       editor.getSession().setUseSoftTabs(true)
       editor.$blockScrolling = Infinity
-      span = angular.element(document.getElementById('process-code-editor'))
-      heights = []
-      e = element[0].parentElement.parentElement
-      while e
-        heights.push(e.offsetHeight) unless e.offsetHeight == 0
-        e = e.parentElement
+      angular.ace[id] = editor
+      span = angular.element(document.getElementById(id))
+      editorHeight = new EditorHeight(scope,element,attributes)
       angular.element(window).on 'resize', (event)->
-        span.css('height',heights.min() + 'px')
-      span.css('fontSize', '14px').css('height',heights.min() + 'px')
+        span.css('height',editorHeight.height())
+        editor.resize()
+      span.css('fontSize', '14px').css('height',editorHeight.height())
       scope.$watch attributes.ngModel, (newVal, oldVal) ->
         unless newVal == editor.getValue()
           if newVal && oldVal

data/lib/material_raingular/ace/version.rb

@@ -1,5 +1,5 @@
 module MaterialRaingular
   module Ace
-    VERSION = "0.0.2.alpha"
+    VERSION = "0.0.3.alpha"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular-ace
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler