marty 2.1.3 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3bf0f31bb663ffc3669aac3ae5011873733aa5be
4
- data.tar.gz: f7a446e2edd7eb3d32d93122172cf7a264c1c989
3
+ metadata.gz: 7660337b038582cb1d61e1815be6a1053a3b50d7
4
+ data.tar.gz: 3402612fbfb97cdb57ce87a8285fe12e8cd12f75
5
5
  SHA512:
6
- metadata.gz: 4b3bd29273e8c4499177c8009db0033b760602c0c54166711ec5e30d0c5141f320816a05745ff77a9e7bf60f8539aeba30d52308a4af311362c9fb0732dfa3d9
7
- data.tar.gz: d158854afe0bad5977abb32d983dc26807f8a96a73a8fe4a51bbe8f03493abd92d6fd9301de4d614f0c50a7f126252a335de70693892a46cea7a463c464343a7
6
+ metadata.gz: 233e3f37aa925df7c444ccaff61333d515c318fb65dfd2ce3558a794f5f45b7edd5c553c0d59696b307d0606727ada743a7edab2f515a004ccc9a29f7dfed1ee
7
+ data.tar.gz: 9b0a208473b3cdd99620f82b0b16cf9c86805aff90fbbb5496165117ca935b233b67fe321d9e9d6a47286b9df386c3371875872f75227d2786058a0720f35bbd
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- marty (2.1.2)
4
+ marty (2.1.4)
5
5
  aws-sigv4 (~> 1.0, >= 1.0.2)
6
6
  axlsx (= 3.0.0pre)
7
7
  coderay
@@ -322,7 +322,7 @@ module Netzke
322
322
 
323
323
  include_core_js(res)
324
324
 
325
- # load javascript overrides
325
+ # MONKEY: load javascript overrides
326
326
  overrides = ["#{File.dirname(__FILE__)}/javascript/overrides.js"]
327
327
 
328
328
  (Netzke::Core.ext_javascripts + overrides).each do |path|
@@ -332,6 +332,15 @@ module Netzke
332
332
 
333
333
  minify_js(res)
334
334
  end
335
+
336
+ def minify_js(js_string)
337
+ if ::Rails.env.test? || ::Rails.env.development?
338
+ js_string.gsub(/\/\*\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//, '') # strip docs
339
+ else
340
+ # MONKEY: enable es6 by passing in harmony argument
341
+ Uglifier.compile(js_string, harmony: true)
342
+ end
343
+ end
335
344
  end
336
345
  end
337
346
  end
@@ -1,3 +1,3 @@
1
1
  module Marty
2
- VERSION = "2.1.3"
2
+ VERSION = "2.1.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: marty
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arman Bostani
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2018-07-03 00:00:00.000000000 Z
17
+ date: 2018-07-06 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: pg