Skip to content

Commit

Permalink
Fixed an issue with the copy function , added support for connect
Browse files Browse the repository at this point in the history
Fixed some references in the components for the JQM page build.
  • Loading branch information
imaginethepoet committed Oct 16, 2013
1 parent c133bb3 commit 6941cff
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 7 deletions.
26 changes: 24 additions & 2 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@ module.exports = (grunt) ->
].join('&&')


# rename JQM css files to my liking
renamecss:
command:['cd assets/css/',
'ren jquery.mobile.min.css jquery-mobile-min.css '
'echo css JQM files renamed'
].join('&&')


# rename JQM JS files to my liking
renamejs:
command:['cd assets/js',
'ren jquery.mobile.min.js jquery-mobile-min.js '
'echo js JQM files renamed'
].join('&&')


# copy over our end distribution resources
copy:
jqmcss:
Expand Down Expand Up @@ -85,7 +101,8 @@ module.exports = (grunt) ->
connect:
server:
options:
port:9001
protocol:'http'
port:8000
base:''


Expand Down Expand Up @@ -134,7 +151,12 @@ module.exports = (grunt) ->

grunt.registerTask('build-jqm-js', ['copy:jqmjs']);

grunt.registerTask('rename-jqm-css', ['shell:renamecss']);

grunt.registerTask('rename-jqm-js', ['shell:renamejs']);


# Tak setups and runs the install grunt command for JQM package, setups all the assets, and then fires the watch command start coding.
grunt.registerTask('setup-jqm', ['get-jqm', 'setup-jquery', 'setup-jqm-node', 'build-jqm', 'build-jqm-css', 'build-jqm-js', 'default']);
grunt.registerTask('setup-jqm', ['get-jqm', 'setup-jquery', 'setup-jqm-node', 'build-jqm', 'build-jqm-css', 'build-jqm-js', 'rename-jqm-css', 'rename-jqm-js', 'default']);

grunt.registerTask('default', ['connect', 'watch']);
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"grunt-shell": "~0.3.1",
"grunt-contrib-connect": "~0.5.0",
"grunt-bake": "~0.2.1",
"connect-livereload": "~0.3.0",
"grunt-contrib-less": "~0.7.0"
},
"engine": "node >= 0.4.1"
Expand Down
1 change: 1 addition & 0 deletions resources/custom/components/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<!-- Custom JS Files -->
<script src="assets/js/app.js"></script>


<!-- Core JQM CSS Files -->
<link rel="stylesheet" href="assets/css/jquery-mobile-min.css">

Expand Down
6 changes: 3 additions & 3 deletions resources/custom/components/page1.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<div data-role="page" id="page1">

<div data-role="header">
<h1>Foo</h1>
<h1>THE FIRST PAGE MY FRIEND</h1>
</div>

<div data-role="content">
<p>Demo output Changed</p>
<p>Changed Output - NEW</p>
<p>Roll content into me I rock</p>
<p>I'm first in the source order so I'm shown as the page.</p>
<p>View internal page called <a href="#bar">bar</a></p>
<p>View internal page called <a href="#page3">page3</a></p>
</div>

<div data-role="footer">
Expand Down
2 changes: 1 addition & 1 deletion resources/custom/components/page2.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h1>Foo</h1>

<div data-role="content">
<p>I'm first in the source order so I'm shown as the page.</p>
<p>View internal page called <a href="#bar">bar</a></p>
<p>View internal page called <a href="#page1">Page 1</a></p>
</div>

<div data-role="footer">
Expand Down
2 changes: 1 addition & 1 deletion resources/custom/components/page3.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1>Foo</h1>
<p>brandon</p>
<p>Roll content into me I rock</p>
<p>I'm first in the source order so I'm shown as the page.</p>
<p>View internal page called <a href="#bar">bar</a></p>
<p>View internal page called <a href="#page2">page2</a></p>
</div>

<div data-role="footer">
Expand Down

0 comments on commit 6941cff

Please sign in to comment.