Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Commit

Permalink
refactor(Mac): Removed jQuery dependencies
Browse files Browse the repository at this point in the history
Closes #7
  • Loading branch information
adrianlee44 committed Nov 7, 2014
1 parent fc84089 commit 174d60c
Show file tree
Hide file tree
Showing 20 changed files with 1 addition and 37 deletions.
3 changes: 0 additions & 3 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ module.exports = (grunt) ->
grunt.initConfig
pkg: grunt.file.readJSON "package.json"
bower: grunt.file.readJSON "bower.json"
jqueryUI: grunt.file.readJSON "bower_components/jquery.ui/package.json"
buildConf: grunt.file.readJSON "build.json"

grunt.loadTasks "misc/grunt"

require('time-grunt') grunt

grunt.registerTask "concatDeploy", [
"concat:jqueryui"
"concat:appJs"
"concat:deployAppJs"
"concat:modulesJs"
Expand Down Expand Up @@ -61,7 +59,6 @@ module.exports = (grunt) ->
"coffee"
"stylus"
"jade"
"concat:jqueryui"
"concat:appJs"
"concat:css"
"clean"
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ Duct Tape and a Swiss Army Knife. Angular helpers for all your friends!
## 3rd party libraries dependencies ##
Libraries are only needed for a few directives,
- AngularJS (1.2.x+)
- jQuery (datepicker)
- jQuery UI (datepicker)
- Underscore String (Underscore string filter)

## Using MacGyver ##
Expand Down
4 changes: 1 addition & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
"package.json"
],
"devDependencies": {
"angular-mocks": "~1.2.0",
"jquery": "~2.0.3",
"jquery.ui": "~1.10.3"
"angular-mocks": "~1.2.0"
},
"dependencies": {
"angular": "~1.2.0",
Expand Down
5 changes: 0 additions & 5 deletions build.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"full": [
"tmp/app/main.js",
"tmp/jqueryui.js",
"tmp/app/**/*.js"
],
"core": [
Expand Down Expand Up @@ -32,10 +31,6 @@
"underscoreFilter": [
"tmp/app/filters/underscore.js"
],
"jqueryui": [
"bower_components/jquery.ui/ui/jquery.ui.core.js",
"bower_components/jquery.ui/ui/jquery.ui.datepicker.js"
],
"css": {
"example": [
"vendor/css/*.css",
Expand Down
1 change: 0 additions & 1 deletion docs/layout.jade
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ html
li ·
li: a(href="https://github.com/angular-macgyver/MacGyver/blob/master/README.md") README

script(src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js", type='text/javascript')
script(src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js", type="text/javascript")
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.18/angular.min.js", type="text/javascript")
script(src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js", type="text/javascript")
Expand Down
Binary file removed lib/img/ui-bg_flat_0_aaaaaa_40x100.png
Binary file not shown.
Binary file removed lib/img/ui-bg_glass_75_ffffff_1x400.png
Binary file not shown.
Binary file removed lib/img/ui-icons_222222_256x240.png
Binary file not shown.
Binary file removed lib/img/ui-icons_2e83ff_256x240.png
Binary file not shown.
Binary file removed lib/img/ui-icons_454545_256x240.png
Binary file not shown.
Binary file removed lib/img/ui-icons_888888_256x240.png
Binary file not shown.
Binary file removed lib/img/ui-icons_cd0a0a_256x240.png
Binary file not shown.
Binary file removed lib/img/ui-icons_f6cf3b_256x240.png
Binary file not shown.
8 changes: 0 additions & 8 deletions misc/grunt/contrib-concat.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,13 @@ module.exports = (grunt) ->

#
# Concat section
# jqueryui - compile required jquery ui files
# appJs - concat all the application code into MacGyver.js
# deployAppJs - concat all app code for deployment
# modulesJs - modularized js
# css - compile all css
#

grunt.config "concat",
jqueryui:
options:
process: (src, filepath) ->
src.replace /@VERSION/g, grunt.config.get("jqueryUI").version
dest: "tmp/jqueryui.js"
src: "<%= buildConf.jqueryui %>"

appJs:
dest: "example/js/<%= pkg.name %>.js"
src: "<%= buildConf.full %>"
Expand Down
8 changes: 0 additions & 8 deletions misc/grunt/contrib-copy.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ module.exports = (grunt) ->
# when deploying code
#
grunt.config "copy",
images:
files: [
expand: true
flatten: true
src: ["src/img/ui-*.png"]
dest: "lib/img/"
]

example:
files: [
{
Expand Down
1 change: 0 additions & 1 deletion misc/grunt/contrib-watch.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = (grunt) ->
tasks: [
"karma:unit:run"
"coffee"
"concat:jqueryui"
"concat:appJs"
"clean"
]
Expand Down
1 change: 0 additions & 1 deletion misc/grunt/karma.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module.exports = (grunt) ->
singleRun: true
options:
files: [
"bower_components/jquery/jquery.js"
"bower_components/angular/angular.js"
"src/template/*.html"
"lib/macgyver.js"
Expand Down
1 change: 0 additions & 1 deletion test/e2e/modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

<button mac-modal="overlay-modal" id="open-overlay-btn">Open</button>

<script src="/bower_components/jquery/jquery.js"></script>
<script src="/bower_components/angular/angular.js"></script>
<script src="/lib/macgyver.js"></script>
</body>
Expand Down
1 change: 0 additions & 1 deletion test/e2e/time.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

<span class="output">{{testStartTime}}<span>

<script src="/bower_components/jquery/jquery.js"></script>
<script src="/bower_components/angular/angular.js"></script>
<script src="/lib/macgyver.js"></script>
</body>
Expand Down
3 changes: 0 additions & 3 deletions test/karma.conf.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ module.exports = (config) ->
# list of files / patterns to load in the browser
files: [
# Javascript
"bower_components/jquery/jquery.js"
"bower_components/underscore.string/lib/underscore.string.js"
"bower_components/jquery.ui/ui/jquery.ui.core.js"
"bower_components/jquery.ui/ui/jquery.ui.datepicker.js"
"bower_components/angular/angular.js"
"bower_components/angular-animate/angular-animate.js"

Expand Down

0 comments on commit 174d60c

Please sign in to comment.