FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Namespacing (and noConflicting) the crap out of search_embeds. Taking… · documentcloud/documentcloud@fe10599 · GitHub

This repository was archived by the owner on Mar 11, 2021. It is now read-only.
/ documentcloud Public archive

Commit fe10599

Browse files
samuelclay
authored and
knowtheory
committed
Namespacing (and noConflicting) the crap out of search_embeds. Taking out dependency on Inflector.js.
1 parent 52fbad2 commit fe10599

12 files changed

Lines changed: 598 additions & 501 deletions

File tree

‎app/views/admin/test_embedded_search.html.erb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<title></title>
55
<%= include_stylesheets(:search_embed) %>
66
<%= include_javascripts(:search_embed) %>
7+
<% Jammit.load_configuration('config/assets.yml') %>
78
</head>
89
<body style="margin:0; padding:0;">
910
<div class="DC-embed-preview">

‎app/views/jst/embed/embed_document_tile.jst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="DC-document-thumbnail"><img src="<%= doc.get('resources')['thumbnail'] %>" /></div>
44
<div class="DC-document-title">
55
<div class="DC-icon DC-icon-lock"></div>
6-
<%= Inflector.truncateWords(doc.get('title'), titleWidth) %>
6+
<%= dc.Inflector.truncateWords(doc.get('title'), titleWidth) %>
77
</div>
8-
<div class="DC-document-description"><%= Inflector.truncateWords(doc.get('description') || "", descriptionWidth) %></div>
8+
<div class="DC-document-description"><%= dc.Inflector.truncateWords(doc.get('description') || "", descriptionWidth) %></div>
99
</a>

‎app/views/jst/embed/paginator.jst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
of
1616
<% } %>
1717
<a href="<%= workspace_url %>" title="View these documents on DocumentCloud" class="DC-quiet-link">
18-
<%= total %> <%= Inflector.pluralize('document', total) %>
18+
<%= total %> <%= total==1 ? 'document' : 'documents' %>
1919
</a>
2020
</div>
2121

‎config/assets.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ javascripts:
2222
- public/javascripts/vendor/underscore-*.js
2323
- public/javascripts/vendor/jquery-*.js
2424
- public/javascripts/vendor/backbone-*.js
25+
- public/javascripts/vendor/underscore.noconflict.js
26+
- public/javascripts/vendor/jquery.noconflict.js
27+
- public/javascripts/vendor/backbone.noconflict.js
2528
- public/javascripts/lib/inflector.js
2629
- public/javascripts/lib/jquery_placeholder.js
2730
- public/javascripts/embed/search_embed.js

‎config/search_embed_assets.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
javascript_compressor: closure
2+
template_function: dc._.template
3+
embed_assets: datauri
4+
5+
javascripts:
6+
search_embed:
7+
- public/javascripts/vendor/underscore-*.js
8+
- public/javascripts/vendor/jquery-*.js
9+
- public/javascripts/vendor/backbone-*.js
10+
- public/javascripts/noconflict/underscore.noconflict.js
11+
- public/javascripts/noconflict/jquery.noconflict.js
12+
- public/javascripts/noconflict/backbone.noconflict.js
13+
- public/javascripts/lib/jquery_placeholder.js
14+
- public/javascripts/embed/search_embed.js
15+
- app/views/jst/embed/*.jst
16+
17+
stylesheets:
18+
search_embed:
19+
- public/stylesheets/embed/search_embed.css

‎lib/tasks/build.rake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace :build do
5454

5555
task :embed do
5656
FileUtils.rm_r('build') if File.exists?('build')
57-
sh "jammit -f -o build -p search_embed"
57+
sh "jammit -f -o build -c config/search_embed_assets.yml"
5858
sh "rm build/*.gz"
5959

6060
Dir['build/*.css'].each do |css_file|

‎public/embed/search_embed.js‎

Lines changed: 216 additions & 223 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL