material_raingular 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03980b9a6d9bf6a3d71f36453f0f5eee0f399de8
-  data.tar.gz: 6e5458e8885aa46d0b974f3065052d17cd3b0d03
+  metadata.gz: dd3b0de67560394702ab17c967af7ed1fc575b86
+  data.tar.gz: 5fb5ac84e3ada975ca03f737dbdfe4371702bc80
 SHA512:
-  metadata.gz: e9c572a1c47ece8bbf2655d8ab03dc7c736fd37275b004440b4852c3fb6c221ca6e8d023fdcbd67175f0b518f82e0468c4f4375e9bd6be608d3d80356eed2761
-  data.tar.gz: 115da2a6610b43fa3111186ed8f78a601937ddcc929d925436d5afc4d22f171f728500cd8a1cb10ff49445b8232c67cfca23d672dba9cbe5589c6fb0a13d36ad
+  metadata.gz: e5c74de317460b634fa55e7931c20f7d80bc656b50b3f3ccf90732a521479142073002ad529e591000ea89624d2b6371249588c8aab9fe54a3a3ef426ab9cd68
+  data.tar.gz: 6baa17e1247fd2977ff280707a98ffb1fdc63c454595c35cd5fde004a3a125f8931755b46bc7b8e33af617320c7c1785007baaa5f25b0c11a93fe82b954c2880

data/lib/assets/javascripts/directives/filteredselect.js.coffee

@@ -281,6 +281,12 @@ angular.module('FilteredSelect', [])
         if fieldset.length > 0
           ngdis = if fieldset[0].attributes.ngDisabled then fieldset[0].attributes.ngDisabled.value else ''
           return true if fieldset[0].attributes.disabled || $parse(ngdis)(scope)
+        form = element[0]
+        until form.nodeName == 'FORM' || !form
+          form = form.parentNode
+          break if !form
+        form ||= element[0]
+        return true if form.disabled
         return false
 
       viewOptions = JSON.parse(attrs.filterOptions || '{}')

data/lib/assets/javascripts/directives/ngdestroy.js.coffee

@@ -5,6 +5,12 @@ angular.module 'NgDestroy', ['Factories']
     require: '?ngCallback'
     link: (scope, element, attributes, ngCallbackCtrl) ->
       element.bind 'click', (event) ->
+        form = element[0]
+        until form.nodeName == 'FORM' || !form
+          form = form.parentNode
+          break if !form
+        form ||= element[0]
+        return if attributes.disabled || form.disabled
         destroy(attributes.ngDestroy,attributes.ngContext)
       destroy = (modelName,listName) ->
         factory = factoryName(modelName)

data/lib/assets/javascripts/directives/ngupload.js.coffee

@@ -1,151 +1,139 @@
-selectFile = (scope,event,attributes,file) ->
-  model  = attributes.ngModel.split('.')
-  id     = scope[attributes.ngModel.split('.')[0]].id
-  parent = null
-  if attributes.ngContext
-    parent = attributes.ngContext
-  scope.uploadFiles(model,id,file,parent)
-  event.preventDefault()
+class FileUpload
+  constructor: (@parse,@scope,controllers,model,override,@element)->
+    [@ngModel,@ngCallback] = controllers
+    modelName    = (override || model)
+    if parts = modelName.match(/(.+)\[(.+)\]/)
+      @modelName = parts[1]
+      @atomName  = @parse(parts[2])()
+    else
+      [@modelName,@atomName] = modelName.split('.')
+    @override    = !!override
+  uploadFile: (file)->
+    @scope.progress = 0
+    @element.addClass('covered')
+    id = @scope.$eval(@modelName).id
+    route = Routes[@modelName + '_path'](id: id) + '.json'
+    formData = new FormData()
+    formData.append @modelName + '[id]', id
+    formData.append @modelName + '[' + @atomName + ']', file
+    xhr = new XMLHttpRequest()
+    xhr.upload.addEventListener "progress", (event) =>
+      if event.lengthComputable
+        @scope.$apply =>
+          @scope.progress = Math.round(event.loaded * 100 / event.total)
+    , true
+    xhr.addEventListener "readystatechange", (event) =>
+      if event.target.readyState == 4 && !(event.target.status > 399)
+        data = JSON.parse(event.target.response)
+        @scope.$apply =>
+          @scope[@modelName][@atomName] = data[@atomName]
+          @scope[@modelName].thumb = data.thumb
+          @scope.progress = 100
+          @element.removeClass('covered')
+          @ngCallback.evaluate(data) if !!@ngCallback
+      else if event.target.readyState == 4 && event.target.status > 399
+        failed()
+    , false
+    xhr.addEventListener "error", (event) ->
+      failed()
+    , false
+    failed = ->
+      @element.addClass('failed')
 
-fileData = (scope,attributes) ->
-  data = {}
-  unparsedModel = attributes.ngModel.split('.')
-  if scope[unparsedModel[0]]
-    if scope[unparsedModel[0]][unparsedModel[1]]
-      unparsed   = scope[unparsedModel[0]][unparsedModel[1]].location.split('/')
-      name       = unparsed.pop()
-      id         = unparsed.pop()
-      mounted_as = unparsed.pop()
-      model      = unparsed.pop()
-      data.path  = scope[unparsedModel[0]][unparsedModel[1]].url
-      data.name  = name
-      data.thumb = scope[unparsedModel[0]].thumb.url if scope[unparsedModel[0]].thumb
-  return data
+      timeout ->
+        @element.removeClass('failed')
+        @element.removeClass('covered')
+      , 2000
 
-uploadFiles = (scope,element,model,id,file,parent,timeout,callback) ->
-  scope.progress = 0
-  element.addClass('covered')
-  route = Routes[element[0].attributes['ng-model'].value.split('.')[0] + '_path'](id: id) + '.json'
-  formData = new FormData()
-  formData.append model[0] + '[id]', id
-  formData.append model[0] + '[' + model[1] + ']', file
-  formData.append model[0] + '[' + parent + '_id]', $scope[parent].id if parent
-  xhr = new XMLHttpRequest()
-  xhr.upload.addEventListener "progress", (event) ->
-    if event.lengthComputable
-      scope.$apply ->
-        scope.progress = Math.round(event.loaded * 100 / event.total)
-  , false
-  xhr.addEventListener "readystatechange", (event) ->
-    if this.readyState == 4 && !(this.status > 399)
-      data = JSON.parse(event.target.response)
-      scope.$apply ->
-        scope[model[0]][model[1]] = data[model[1]]
-        scope[model[0]].thumb = data.thumb
-        scope.progress = 100
-        element.removeClass('covered')
-        scope.$eval(callback) if callback
-    else if this.readyState == 4 && this.status > 399
-      failed()
-  , false
-  xhr.addEventListener "error", (event) ->
-    failed()
-  , false
-  failed = ->
-    element.addClass('failed')
+    xhr.open("PUT", route)
+    csrf = null
+    for tag in document.getElementsByTagName('meta')
+      csrf = tag.content if tag.name == 'csrf-token'
+    xhr.setRequestHeader('X-CSRF-Token', csrf)
+    xhr.send(formData)
 
-    timeout ->
-      element.removeClass('failed')
-      element.removeClass('covered')
-    , 2000
+  fileData: ->
+    data = {}
+    if @scope[@modelName]
+      if @scope[@modelName][@atomName]
+        data.path  = @scope[@modelName][@atomName].url
+        data.name  = @scope[@modelName][@atomName].name
+        data.thumb = @scope[@modelName].thumb.url if @scope[@modelName].thumb
+    return data
 
-  xhr.open("PUT", route)
-  csrf = null
-  for tag in document.getElementsByTagName('meta')
-    csrf = tag.content if tag.name == 'csrf-token'
-  xhr.setRequestHeader('X-CSRF-Token', csrf)
-  xhr.send(formData)
+class NgUploadEvents
+  constructor: (@element,@file_upload) ->
+    clicked = false
+    @element.children('img').bind 'click', (event) =>
+      return if clicked
+      event.target.parentElement.getElementsByTagName('input')[0].click()
+    @element.children('.button').bind 'click', (event) =>
+      return if clicked
+      event.target.parentElement.getElementsByTagName('input')[0].click()
+    @element.children('input').bind 'click', (event) =>
+      clicked = true
+    @element.children('input').bind 'change', (event) =>
+      file   = event.target.files[0]
+      @file_upload.uploadFile(file)
+      clicked = false
+
+class NgDropFileEvents
+  constructor: (@element,@file_upload) ->
+    dragHovered = 0
+    el = angular.element("<div class='hovered-cover'>Drop Files Here</div>")
+    @element.bind 'dragenter', (event) =>
+      dragHovered += 1
+      @element.addClass('hovered') if dragHovered == 1
+      @element.append el if dragHovered == 1
+      height = window.getComputedStyle(@element[0]).height
+      el.css('height', height)
+      el.css('line-height',height)
+      el.css('margin-top', '-' + height)
+    @element.bind 'dragleave', (event) =>
+      dragHovered -= 1
+      @element.removeClass('hovered') if dragHovered == 0
+      el.remove() if dragHovered == 0
+    @element.bind 'dragover', (event) =>
+      event.preventDefault()
+      event.stopPropagation()
+    @element.bind 'drop', (event) =>
+      event.preventDefault()
+      event.stopPropagation()
+      @element.removeClass('hovered')
+      el.remove()
+      dragHovered = 0
+      file   = (event.originalEvent || event).dataTransfer.files[0]
+      @file_upload.uploadFile(file)
 
 angular.module('NgUpload', [])
 
-  .directive 'ngDropFile', ->
+  .directive 'ngDropFile', ($timeout,$parse) ->
     restrict: 'A'
-    require: 'ngModel'
-    link: (scope, element, attributes) ->
-      dragHovered = 0
-      el = angular.element("<div class='hovered-cover'>Drop Files Here</div>")
-      element.bind 'dragenter', (event) ->
-        dragHovered += 1
-        element.addClass('hovered') if dragHovered == 1
-        element.append el if dragHovered == 1
-        height = window.getComputedStyle(element[0]).height
-        el.css('height', height)
-        el.css('line-height',height)
-        el.css('margin-top', '-' + height)
-      element.bind 'dragleave', (event) ->
-        dragHovered -= 1
-        element.removeClass('hovered') if dragHovered == 0
-        el.remove() if dragHovered == 0
-      element.bind 'dragover', (event) ->
-        event.preventDefault()
-        event.stopPropagation()
-      element.bind 'drop', (event) ->
-        event.preventDefault()
-        event.stopPropagation()
-        element.removeClass('hovered')
-        el.remove()
-        dragHovered = 0
-        file   = (event.originalEvent || event).dataTransfer.files[0]
-        selectFile(scope,event,attributes,file)
-      scope.file = ->
-        fileData(scope,attributes)
+    require: ['ngModel','?ngCallback']
+    link: (scope, element, attributes,controllers) ->
+      file_upload = new FileUpload($parse,scope,controllers,attributes.ngModel,attributes.ngOverride,element)
+      new NgDropFileEvents(element,file_upload)
+      scope.file_upload_data =        -> file_upload.fileData()
 
-    controller: ($scope, $element, $http, $timeout) ->
-      callback = ->
-        $element[0].attributes['ng-callback'].value if $element[0].attributes['ng-callback']
-      $scope.uploadFiles = (model,id,file,parent) ->
-        uploadFiles($scope,$element,model,id,file,parent,$timeout,callback())
-      $scope.progress = 0
-      $scope.uploadProgress = ->
-        return $scope.progress
-  .directive 'ngUpload',  ->
+  .directive 'ngUpload', ($timeout, $parse) ->
     restrict: 'E'
     replace: true,
-    require: 'ngModel',
+    require: ['ngModel','?ngCallback'],
     template:
-      '<span class="ng-upload">
+      '<span class="ng-upload" style="outline: none">
         <div class="ng-progress-bar">
-          <span class="bar" style="width: {{uploadProgress() || 0}}%;"></span><span class="text" style="margin-left: -{{uploadProgress() || 0}}%;">{{uploadProgress()}}%</span>
+          <span class="bar" style="width: {{progress || 0}}%;"></span><span class="text" style="margin-left: -{{uploadProgress() || 0}}%;">{{uploadProgress()}}%</span>
         </div>
-        <input accept="{{accept()}}" ng-model="ngModel" type="file" ng-class="{image: show(&#39;image&#39;)}" /><img ng-show="show(&#39;image&#39;)" ng-src="{{file().thumb}}" />
-        <div class="button" ng-show="show(&#39;button&#39;)">
+        <input accept="{{accept()}}" ng-model="ngModel" type="file" ng-class="{image: file_upload_show(&#39;image&#39;)}" /><img ng-show="file_upload_show(&#39;image&#39;)" ng-src="{{file_upload_data().thumb}}" />
+        <div class="button" ng-show="file_upload_show(&#39;button&#39;)">
           Select File
         </div>
-        <a download="" href="{{file().path}}" ng-show="show(&#39;text&#39;)" target="_blank">{{file().name}}</a></span>'
+        <a download="" href="{{file_upload_data().path}}" ng-show="file_upload_show(&#39;text&#39;)" target="_blank">{{file_upload_data().name}}</a></span>'
 
-    link: (scope, element, attributes) ->
-      element.children('img').bind 'click', (event) ->
-        this.parentElement.getElementsByTagName('input')[0].click()
-      element.children('.button').bind 'click', (event) ->
-        this.parentElement.getElementsByTagName('input')[0].click()
-      element.children('input').bind 'click', (event) ->
-        event.stopPropagation()
-      element.children('input').bind 'change', (event) ->
-        file   = event.target.files[0]
-        selectFile(scope,event,attributes,file)
-      scope.file = ->
-        fileData(scope,attributes)
-      scope.accept = ->
-        return attributes.accept if attributes.accept
-        return '*'
-    controller: ($scope, $element, $http, $timeout) ->
-      callback = ->
-        $element[0].attributes['ng-callback'].value if $element[0].attributes['ng-callback']
-      $scope.show = (type) ->
-        options = $element[0].attributes['ng-upload-options'].value.replace('{','').replace('}','').split(',')
-        for option in options
-          if option.indexOf(type) > -1
-            return true if option.indexOf('true') > -1
-        return false
-      $scope.uploadFiles = (model,id,file,parent) ->
-        uploadFiles($scope,$element,model,id,file,parent,$timeout,callback())
+    link: (scope, element, attributes,controllers) ->
+      file_upload = new FileUpload($parse,scope,controllers,attributes.ngModel,attributes.ngOverride,element)
+      new NgUploadEvents(element,file_upload)
+      options = $parse(attributes.ngUploadOptions)()
+      scope.file_upload_show = (type) -> options[type]
+      scope.file_upload_data =        -> file_upload.fileData()
+      scope.accept           =        -> attributes.accept || '*'

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler