Skip to content

Commit

Permalink
1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
onokumus committed Nov 1, 2014
1 parent d3d4d70 commit 8e179d5
Show file tree
Hide file tree
Showing 16 changed files with 292 additions and 417 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ lib-cov
.tmproj
.directory
nbproject
backup
Thumbs.db

# Komodo
Expand All @@ -51,4 +52,4 @@ vendor
_gh_pages
tmp
temp
TODO.md
TODO.md
124 changes: 62 additions & 62 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
"use strict";

module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),
banner: "/*\n" +
" * <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n" +
" * <%= pkg.description %>\n" +
" * <%= pkg.homepage %>\n" +
" *\n" +
" * Made by <%= pkg.author.name %>\n" +
" * Under <%= pkg.license %> License\n" +
" */\n",
jshint: {
options: {
jshintrc: ".jshintrc"
},
all: [
"Gruntfile.js",
"src/metisMenu.js"
]
},
concat: {
plugin: {
src: ["src/metisMenu.js"],
dest: "dist/metisMenu.js"
},
css: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.css"
},
options: {
banner: "<%= banner %>"
}
},
uglify: {
plugin: {
src: ["dist/metisMenu.js"],
dest: "dist/metisMenu.min.js"
},
options: {
banner: "<%= banner %>"
}
},
cssmin: {
options: {
banner: "<%= banner %>"
},
menucss: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.min.css"
}
}
});
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-cssmin");
grunt.registerTask("travis", ["jshint"]);
grunt.registerTask("default", ["jshint", "concat", "uglify", "cssmin"]);
};
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),

banner: "/*\n" +
" * <%= pkg.title || pkg.name %> - v<%= pkg.version %>\n" +
" * <%= pkg.description %>\n" +
" * <%= pkg.homepage %>\n" +
" *\n" +
" * Made by <%= pkg.author.name %>\n" +
" * Under <%= pkg.license %> License\n" +
" */\n",

jshint: {
options: {
jshintrc: ".jshintrc"
},
all: [
"Gruntfile.js",
"src/metisMenu.js"
]
},
concat: {
plugin: {
src: ["src/metisMenu.js"],
dest: "dist/metisMenu.js"
},
css: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.css"
},
options: {
banner: "<%= banner %>"
}
},
uglify: {
plugin: {
src: ["dist/metisMenu.js"],
dest: "dist/metisMenu.min.js"
},
options: {
banner: "<%= banner %>"
}
},
cssmin: {
options: {
banner: "<%= banner %>"
},
menucss: {
src: ["src/metisMenu.css"],
dest: "dist/metisMenu.min.css"
}
}
});

grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-cssmin");

grunt.registerTask("travis", ["jshint"]);
grunt.registerTask("default", ["jshint", "concat", "uglify", "cssmin"]);
};
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ bower install metisMenu
1. Include Twitter Bootstrap StyleSheet

```html
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.0/css/bootstrap.min.css">
```

2. Include metisMenu StyleSheet

```html
<link rel="stylesheet" href="//cdn.jsdelivr.net/bootstrap.metismenu/1.1.0/css/metismenu.min.css">
<link rel="stylesheet" href="//cdn.jsdelivr.net/bootstrap.metismenu/1.1.2/css/metismenu.min.css">
```

3. Include jQuery
Expand All @@ -44,13 +44,13 @@ bower install metisMenu
4. Include Twitter Bootstrap Script

```html
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.0/js/bootstrap.min.js"></script>
```

5. Include metisMenu plugin's code

```html
<script src="//cdn.jsdelivr.net/bootstrap.metismenu/1.1.0/js/metismenu.min.js"></script>
<script src="//cdn.jsdelivr.net/bootstrap.metismenu/1.1.2/js/metismenu.min.js"></script>
```

6. Call the plugin:
Expand Down Expand Up @@ -92,8 +92,9 @@ Contains a simple HTML file to demonstrate metisMenu plugin.

### Release History
**DATE** **VERSION** **CHANGES**
* 2014-07-07 v1.1.0 Add double tap functionality
* 2014-06-24 v1.0.3 cdnjs support & rename plugin
* 2014-11-01 v1.1.3 Bootstrap 3.3.0
* 2014-07-07 v1.1.0 Add double tap functionality
* 2014-06-24 v1.0.3 cdnjs support & rename plugin
* 2014-06-18 v1.0.3 Create grunt task
* 2014-06-10 v1.0.2 Fixed for IE8 & IE9

Expand All @@ -109,4 +110,4 @@ metisMenu was made with love by these guys and a bunch of awesome [contributors]

## License

[MIT License](https://github.com/onokumus/metisMenu/blob/master/LICENSE)
[MIT License](https://github.com/onokumus/metisMenu/blob/master/LICENSE)
7 changes: 5 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metisMenu",
"version": "1.1.1",
"version": "1.1.3",
"homepage": "https://github.com/onokumus/metisMenu",
"authors": [
"onokumus <onokumus@gmail.com>"
Expand Down Expand Up @@ -28,5 +28,8 @@
"bower_components",
"test",
"tests"
]
],
"dependencies": {
"bootstrap": "~3.3.0"
}
}
56 changes: 0 additions & 56 deletions dist/jquery.metisMenu.css

This file was deleted.

72 changes: 0 additions & 72 deletions dist/jquery.metisMenu.js

This file was deleted.

9 changes: 0 additions & 9 deletions dist/jquery.metisMenu.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion dist/metisMenu.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* metismenu - v1.1.1
* metismenu - v1.1.3
* Easy menu jQuery plugin for Twitter Bootstrap 3
* https://github.com/onokumus/metisMenu
*
Expand Down
4 changes: 2 additions & 2 deletions dist/metisMenu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* metismenu - v1.1.1
* metismenu - v1.1.3
* Easy menu jQuery plugin for Twitter Bootstrap 3
* https://github.com/onokumus/metisMenu
*
Expand Down Expand Up @@ -100,7 +100,7 @@
},

remove: function() {
this.element.find('a').off("." + pluginName);
this.element.off("." + pluginName);
this.element.removeData(pluginName);
}

Expand Down
2 changes: 1 addition & 1 deletion dist/metisMenu.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* metismenu - v1.1.1
* metismenu - v1.1.3
* Easy menu jQuery plugin for Twitter Bootstrap 3
* https://github.com/onokumus/metisMenu
*
Expand Down
2 changes: 1 addition & 1 deletion dist/metisMenu.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8e179d5

Please sign in to comment.