material_raingular 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa22bc91bab3129ed13ae71310ea5740630d96d
-  data.tar.gz: e16ff6046e432bfec11c8c83f272bb15c618b578
+  metadata.gz: d445f0bfacc19a8033e265c429b9653c9307111e
+  data.tar.gz: 769cc6a6e50276bb9bce02f23575cee866cc85a9
 SHA512:
-  metadata.gz: 560c997364ce335d5d21b7b414c25001e21c0aebbaa2941f71eb63d6a4e762861c73ea02e131c4f1a67d05d9f3ecc997119a4001105bf05e201a9b15e431a7c4
-  data.tar.gz: 178aea0d96697a4a514ea76d668d40c3ae5b991a77ff82f461c0b244508203fe5fe575489f4390f6ec35778a6adc985b274674de8f3c5f6d23f0c2eebc924ad7
+  metadata.gz: f93fc031110a2000616fd151755982f785c6bd53f3c362f25ff5c0b0a9b61989231ae22a6034d774399c2eed1b54412edeb9ee39caa1700acb3a32a718aa2dbf
+  data.tar.gz: e41e9880c1252914a4bb8922966b94811034ed85437da1b77419354b87a2f83e810c47d35328bbd3a6a32e5d990b54b67b044194f18b1b412762de8aba0f4da2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    material_raingular (0.6.10)
+    material_raingular (0.6.11)
       js-routes
 
 GEM

data/lib/assets/javascripts/active_record/collection.coffee

@@ -1,4 +1,12 @@
 class ActiveRecord.$Collection extends Array
+  @isCollection: (obj) ->
+    return true if (obj instanceof @)
+    return false unless (obj instanceof Array)
+    return true if obj.$activeCollection
+    obj.$activeCollection = !!obj.reduce(((a,b) -> a?.$activeRecord || b?.$activeRecord),false)
+    return obj.$activeCollection
+
+  $activeCollection: true
   $inject: (args...) ->
     @$injector ||= angular.element(document.body).injector()
     @[item] = @$injector.get(item) for item in args

data/lib/assets/javascripts/active_record/param_serializer.coffee

@@ -8,12 +8,14 @@ class $paramSerializer extends AngularServiceModel
       continue if val == obj['$' + key + '_was']
       continue if val?.toString() == obj['$' + key + '_was']?.toString()
       continue if [undefined,null].includes(val) && [undefined,null].includes(obj["$#{key}_was"])
+      continue if ActiveRecord.$Collection.isCollection(val)
       res[key] = val
     res
   strip: (obj) ->
     res = {}
     for key,val of obj
       continue if ['$','_'].includes(key[0]) || key in ['constructor','initialize']
+      continue if ActiveRecord.$Collection.isCollection(val)
       res[key] = if (typeof val == 'object' && val != null && !val instanceof Date) then @strip(val) else val
     res
   create: (obj) ->

data/lib/assets/javascripts/active_record/resource.coffee

@@ -26,7 +26,9 @@ class ActiveRecord.$Resource extends Module
   $processResponse: (response,apply) ->
     @$resolved = true
     for key,val of response.data
+      continue if key[0] in ['$','_']
       @[key] = val if angular.equals(@[key],@['$' + key + '_was'])# || key in @$updatingKeys
+      continue if ActiveRecord.$Collection.isCollection(val)
       @['$' + key + '_was'] = angular.copy(val) unless key[0] in ['$','_']
     # @$updatingKeys = []
     return @

data/lib/assets/javascripts/material_raingular/directives/upload/linkmodel.coffee

@@ -8,7 +8,7 @@ class DirectiveModels.MrUploadModel extends AngularLinkModel
     [@ngModelCtrl,@mrCallbackCtrl] = @$controller
     [@model,@key] = Helpers.NgModelParse(@$attrs.ngModel,@$scope)
     @fileUpload = new Helpers.FileUpload(@$scope,@model,@key,@$element,@callback.bind(@),@$injector)
-    @options = @$scope.$eval(@$attrs.mrUploadOptions)
+    @options = @$scope.$eval(@$attrs.mrUploadOptions || '{}')
     new Modules.MrUploadEvents(@$element,@fileUpload,@disabled)
   callback: (data) ->
     @$scope[@model][@key] = data[@key]

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler