Skip to content

Commit

Permalink
Getting ready for beta release
Browse files Browse the repository at this point in the history
  • Loading branch information
sesemaya committed Sep 8, 2017
1 parent 9101f08 commit afc20cd
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 54 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ module.exports = function(grunt) {
'}\n\n' +
'+function ($) {\n' +
' var version = $.fn.jquery.split(\' \')[0].split(\'.\')\n' +
' if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {\n' +
' throw new Error(\'Material\\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0\')\n' +
' if (version[0] < 3 || version[0] >= 4) {\n' +
' throw new Error(\'Material\\\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0\')\n' +
' }\n' +
'}(jQuery);\n',

Expand Down
34 changes: 17 additions & 17 deletions README.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/js/src.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* navigation drawer
* based on bootstrap's (v4.0.0-alpha.6) modal.js
* based on bootstrap's (v4.0.0-beta) modal.js
*/

var NavDrawer = function ($) {
Expand Down Expand Up @@ -494,7 +494,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* tab indicator animation
* requires bootstrap's (v4.0.0-alpha.6) tab.js
* requires bootstrap's (v4.0.0-beta) tab.js
*/

var TabSwitch = function ($) {
Expand Down Expand Up @@ -641,7 +641,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* global util js
* based on bootstrap's (v4.0.0-alpha.6) util.js
* based on bootstrap's (v4.0.0-beta) util.js
*/

var Util = function ($) {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/src/navdrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Util from './util'

/*
* navigation drawer
* based on bootstrap's (v4.0.0-alpha.6) modal.js
* based on bootstrap's (v4.0.0-beta) modal.js
*/

const NavDrawer = (($) => {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/src/tab-switch.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Util from './util'

/*
* tab indicator animation
* requires bootstrap's (v4.0.0-alpha.6) tab.js
* requires bootstrap's (v4.0.0-beta) tab.js
*/

const TabSwitch = (($) => {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/src/util.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* global util js
* based on bootstrap's (v4.0.0-alpha.6) util.js
* based on bootstrap's (v4.0.0-beta) util.js
*/

const Util = (($) => {
Expand Down
18 changes: 2 additions & 16 deletions css/material.css

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

2 changes: 1 addition & 1 deletion css/material.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/material.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/material.min.css.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions js/material.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Material v4.0.0-alpha.6 (http://daemonite.github.io/material/)
* Material v4.0.0-beta (http://daemonite.github.io/material/)
* Copyright 2017 Daemon Pty Ltd
* Licensed under MIT (https://github.com/Daemonite/material/blob/master/LICENSE)
*/
Expand All @@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') {

+function ($) {
var version = $.fn.jquery.split(' ')[0].split('.')
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {
throw new Error('Material\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
if (version[0] < 3 || version[0] >= 4) {
throw new Error('Material\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0')
}
}(jQuery);

Expand Down Expand Up @@ -311,7 +311,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* navigation drawer
* based on bootstrap's (v4.0.0-alpha.6) modal.js
* based on bootstrap's (v4.0.0-beta) modal.js
*/

var NavDrawer = function ($) {
Expand Down Expand Up @@ -707,7 +707,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* tab indicator animation
* requires bootstrap's (v4.0.0-alpha.6) tab.js
* requires bootstrap's (v4.0.0-beta) tab.js
*/

var TabSwitch = function ($) {
Expand Down Expand Up @@ -854,7 +854,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons

/*
* global util js
* based on bootstrap's (v4.0.0-alpha.6) util.js
* based on bootstrap's (v4.0.0-beta) util.js
*/

var Util = function ($) {
Expand Down
3 changes: 1 addition & 2 deletions js/material.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"url": "https://github.com/Daemonite/material/issues"
},
"dependencies": {
"jquery": ">=3.0.0",
"popper.js": "^1.11.0"
"jquery": "^3.0.0",
"popper.js": "^1.12.3"
},
"description": "Daemonite's Material UI is a cross-platform and fully responsive front-end interface based on Google Material Design developed using Bootstrap 4.",
"devDependencies": {
Expand Down

0 comments on commit afc20cd

Please sign in to comment.