Skip to content

Rename demo/template folder to plural, and update reference to dependencies to build the demo #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimenB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename demo/template folder to plural, and update reference to dependencies to build the demo #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/sh
node r.js -o demo/app.build.js
node r.js -o cssIn=demo-build/styles/screen.build.css out=demo-build/styles/screen.build.css
6 changes: 1 addition & 5 deletions demo/app.build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
},

paths: {
"hbs": "../hbs",
"Handlebars" : "../Handlebars",
"underscore" : "../hbs/underscore",
"i18nprecompile" : "../hbs/i18nprecompile",
"json2" : "../hbs/json2"
"hbs": "../hbs"
// if your project is already using underscore.js and you want to keep
// the hbs plugin even after build (excludeHbs:false) you should set the
// "hbs/underscore" path to point to the shared location like
Expand Down
2 changes: 1 addition & 1 deletion demo/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Require our template with the handlebars plugin
define(['hbs!template/one'], function (tmplOne) {
define(['hbs!templates/one'], function (tmplOne) {
// Find our container
var container = document.getElementById('demo-app-container');
// Run your template function, and inject it.
Expand Down
0 demo/template/coolPartial.hbs → demo/templates/coolPartial.hbs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions demo/template/helpers/all.js → demo/templates/helpers/all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Sucks. I know.


define([
'template/helpers/yeller',
'templates/helpers/yeller'
], function(){
return {};
});
//>>excludeEnd('excludeAfterBuild')
//>>excludeEnd('excludeAfterBuild')
2 changes: 1 addition & 1 deletion demo/template/helpers/myhelper.js → demo/templates/helpers/myhelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["Handlebars"], function(Handlebars) {
define(["hbs/handlebars"], function(Handlebars) {
function myhelper(options) {
return options.fn();
}
Expand Down
2 changes: 1 addition & 1 deletion demo/template/helpers/yeller.js → demo/templates/helpers/yeller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(['Handlebars'], function ( Handlebars ){
define(['hbs/handlebars'], function ( Handlebars ){
function yeller ( context, options ) {
// Assume it's a string for simplicity.
return context + "!!!!!!oneone!!one1";
Expand Down
0 demo/template/i18n/en_ca.json → demo/templates/i18n/en_ca.json
View file
Open in desktop
File renamed without changes.
0 demo/template/i18n/en_us.json → demo/templates/i18n/en_us.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion demo/template/one.hbs → demo/templates/one.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{{/each}}
<br />

{{> template_coolPartial }}
{{> templates/coolPartial }}
<br />
i18n2: {{$ "key2"}}
</div>