locomotivecms_mounter 1.5.3 → 1.5.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: 3fb8beeef4aebb551f67ff1dca5cda0848acacd4
4
- data.tar.gz: b6cb3537c61a224d4f158db2addeb95e34b11447
3
+ metadata.gz: 7b47851083c2f01c0930e555b82d3e198dc76c73
4
+ data.tar.gz: fb1455391d1fa0ef384417339506efef0ac6ad8e
5
5
  SHA512:
6
- metadata.gz: 31a3e5fd03fff443a06c340c5265b7449814d393b1a41a7b2727cc15d7592994bdd52757ab390ebda9c69242db208b1d8a1059c1bdb2c2c94dd14ab779f4084b
7
- data.tar.gz: 173705b2a630f38eaff093e7401bf82857e63ce53bbb58720d5a7d2fc1f70734408dc437399f406672d7c256bc84678d5f538e63d38954948a16c0bf39e78199
6
+ metadata.gz: 1d60472d04d6be9b52f99af8fbea87768655c09e3de33826c8595515c078a52c54f1cd42767fa8e0785c22f763a9c187fdf6d0755e96ec1bd5ef95084e798065
7
+ data.tar.gz: 2577b213dd4b2df3bc70309218cce076ffbfb70d1e1fbdf4b2b88688d3992a5c6ab629087fa9c1725edb848aaac90b1f70fd2ea054c01290f6fa9fb8ef7ae346
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- locomotivecms_mounter (1.5.3)
4
+ locomotivecms_mounter (1.5.4)
5
5
  RedCloth (~> 4.2.3)
6
6
  activesupport (~> 3.2.21)
7
7
  chronic (~> 0.10.2)
@@ -37,7 +37,7 @@ GEM
37
37
  coffee-script (2.2.0)
38
38
  coffee-script-source
39
39
  execjs
40
- coffee-script-source (1.9.1)
40
+ coffee-script-source (1.9.1.1)
41
41
  colorize (0.5.8)
42
42
  commonjs (0.2.7)
43
43
  compass (1.0.3)
@@ -55,7 +55,7 @@ GEM
55
55
  crack (0.4.2)
56
56
  safe_yaml (~> 1.0.0)
57
57
  diff-lcs (1.2.5)
58
- execjs (2.4.0)
58
+ execjs (2.5.2)
59
59
  ffi (1.9.8)
60
60
  haml (4.0.6)
61
61
  tilt
@@ -2,7 +2,7 @@
2
2
  module Locomotive
3
3
  module Mounter #:nodoc
4
4
 
5
- VERSION = '1.5.3'
5
+ VERSION = '1.5.4'
6
6
 
7
7
  end
8
8
  end
@@ -76,8 +76,9 @@ module Locomotive
76
76
  layouts = pages.values.find_all { |page| page.fullpath =~ /^layouts\// }
77
77
 
78
78
  # make sure the templates without the extends tag are first in the list
79
- layouts.sort! { |a, b| (a.extends_template? ? 1 : 0) <=> (b.extends_template? ? 1 : 0) }
80
-
79
+ layouts.sort! do |a, b|
80
+ (a.depth_and_position + (a.extends_template? ? 1000 : 0)) <=> (b.depth_and_position + (b.extends_template? ? 1000 : 0))
81
+ end
81
82
  layouts.each do |page|
82
83
  _write(page, done, false, false)
83
84
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotivecms_mounter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.3
4
+ version: 1.5.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Didier Lafforgue
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-06 00:00:00.000000000 Z
11
+ date: 2015-05-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tilt