bonethug 0.0.54.17 → 0.0.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Bonethug
3
- VERSION = "0.0.54.17"
4
- BUILD_DATE = "2013-10-16 11:52:54 +1300"
3
+ VERSION = "0.0.55"
4
+ BUILD_DATE = "2013-10-16 13:37:14 +1300"
5
5
  end
6
6
 
@@ -133,6 +133,17 @@ Config::inst()->update('GDBackend', 'default_quality', 80);
133
133
  Requirements::set_write_js_to_body(true);
134
134
  Requirements::set_combined_files_enabled(true);
135
135
 
136
+ // HTML5 Shims
137
+ // -----------
138
+
139
+ $shimRequirements = array(
140
+ 'vendor/selectivizr/selectivizr.min.js',
141
+ 'vendor/respond/respond.min.js',
142
+ 'vendor/modernizr/modernizr.js'
143
+ );
144
+ Requirements::combine_files('lte-ie8-shims.js',$shimRequirements);
145
+ Requirements::process_combined_files(); // forces ss to generate the file regardless of blocking
146
+
136
147
  // CSS
137
148
  // ---
138
149
 
@@ -152,19 +163,20 @@ $jsRequirements = array(
152
163
  );
153
164
  Requirements::combine_files('application.js', $jsRequirements);
154
165
 
155
- // HTML5 Shims
156
- // -----------
166
+ // Asset loading
167
+ // -------------
157
168
 
158
- $shimRequirments = array(
159
- 'vendor/selectivizr/selectivizr.min.js',
160
- 'vendor/respond/respond.min.js',
161
- 'vendor/modernizr/modernizr.js'
162
- );
163
- Requirements::combine_files('lte-ie8-shims.js',$shimRequirments);
169
+ // block jquery
170
+ // block the combined shims + component files so we can lead them manually
164
171
  RequirementsHelper::require_block(array_merge(
165
- array('assets/_combinedfiles/lte-ie8-shims.js'),
166
- $shimRequirments
172
+ array(
173
+ 'assets/_combinedfiles/lte-ie8-shims.js',
174
+ 'framework/thirdparty/jquery/jquery.js'
175
+ ),
176
+ $shimRequirements
167
177
  ));
178
+
179
+ // dump this into a conditional
168
180
  Requirements::insertHeadTags('
169
181
  <!--[if (gte IE 6)&(lte IE 8)]>
170
182
  <script src="/assets/_combinedfiles/lte-ie8-shims.js"></script>
@@ -180,5 +192,10 @@ LeftAndMainHelper::require_block(array_merge(
180
192
  ),
181
193
  $cssRequirements,
182
194
  $jsRequirements,
183
- $shimRequirments
195
+ $shimRequirements
196
+ ));
197
+
198
+ // let the cms load its preferred version of jquery
199
+ LeftAndMainHelper::require_unblock(array(
200
+ 'framework/thirdparty/jquery/jquery.js'
184
201
  ));
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bonethug
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.54.17
4
+ version: 0.0.55
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-10-15 00:00:00.000000000 Z
12
+ date: 2013-10-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler