added support for fxos-ui widgets

This commit is contained in:
Rory Petty 2014-04-24 16:32:34 -04:00
Родитель a67a28c684
Коммит 9def7d70e9
3 изменённых файлов: 14 добавлений и 7 удалений

Просмотреть файл

@ -28,7 +28,7 @@ module.exports = function (grunt) {
yeoman: yeomanConfig, yeoman: yeomanConfig,
watch: { watch: {
emberTemplates: { emberTemplates: {
files: '<%%= yeoman.app %>/templates/**/*.hbs', files: ['<%= yeoman.app %>/templates/**/*.hbs','<%= yeoman.app %>/bower_components/**/*.hbs'],
tasks: ['emberTemplates'] tasks: ['emberTemplates']
},<% if (options.coffee) { %> },<% if (options.coffee) { %>
coffee: { coffee: {
@ -315,14 +315,17 @@ module.exports = function (grunt) {
},<% } %> },<% } %>
emberTemplates: { emberTemplates: {
options: { options: {
templateName: function (sourceFile) { /* we use a regular expression to set the paths for your
var templatePath = yeomanConfig.app + '/templates/'; templates in <your app name>/templates and for the fxos-ui templates that
return sourceFile.replace(templatePath, ''); are a bower dependency */
} templateBasePath: /app\/templates\/|app\/bower_components\/fxos-ui\/templates\//
}, },
dist: { dist: {
files: { files: {
'.tmp/scripts/compiled-templates.js': '<%%= yeoman.app %>/templates/{,*/}*.hbs' '.tmp/scripts/compiled-templates.js': [
'app/templates/{,*/}*.hbs',
'app/bower_components/fxos-ui/templates/components/{,*/}*.hbs'
]
} }
} }
},<% if (!options.coffee) { %> },<% if (!options.coffee) { %>

Просмотреть файл

@ -6,7 +6,8 @@
"handlebars": "1.2.1", "handlebars": "1.2.1",
"ember-data": "1.0.0-beta.5", "ember-data": "1.0.0-beta.5",
"brick": "1.0.1", "brick": "1.0.1",
"localforage": "0.4.0" "localforage": "0.4.0",
"fxos-ui": "0.0.1"
}, },
"resolutions": { "resolutions": {
"ember": "1.3.1" "ember": "1.3.1"

Просмотреть файл

@ -1,9 +1,12 @@
FxosUI = window.FxosUI = Ember.Namespace.create()
var <%= _.classify(appname) %> = window.<%= _.classify(appname) %> = Ember.Application.create(); var <%= _.classify(appname) %> = window.<%= _.classify(appname) %> = Ember.Application.create();
/* Order and include as you please. */ /* Order and include as you please. */
require('scripts/controllers/*'); require('scripts/controllers/*');
require('scripts/store'); require('scripts/store');
require('scripts/models/*'); require('scripts/models/*');
require('scripts/routes/*'); require('scripts/routes/*');
require('scripts/views/*'); require('scripts/views/*');
require('scripts/router'); require('scripts/router');
require('/bower_components/fxos-ui/scripts/components/*');