Skip to content

Commit

Permalink
bugfix to dropdown, bumped version number, added jspm directives to p…
Browse files Browse the repository at this point in the history
…ackage.json
  • Loading branch information
Andres Morey committed Jun 10, 2015
1 parent 7304087 commit ab210d6
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 74 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# MUI Changelog

## 0.1.9 - June 10, 2015

* Fixed bug in dropdown to close menu on item select

## 0.1.8 - June 3, 2015

* Added compiled files to release
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ MUI is a lightweight HTML/CSS/JS framework that follows Google's Material Design
**Use From the CDN:**

```html
<link href="//cdn.muicss.com/mui-0.1.8/css/mui.min.css" rel="stylesheet" type="text/css" />
<script src="//cdn.muicss.com/mui-0.1.8/js/mui.min.js"></script>
<link href="//cdn.muicss.com/mui-0.1.9/css/mui.min.css" rel="stylesheet" type="text/css" />
<script src="//cdn.muicss.com/mui-0.1.9/js/mui.min.js"></script>
```

**Install with Bower:**
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mui",
"version": "0.1.8",
"version": "0.1.9",
"license": "MIT",
"authors": [
"Andres Morey <andres@muicss.com>"
Expand Down
2 changes: 1 addition & 1 deletion dist/css/mui.min.css

Large diffs are not rendered by default.

103 changes: 47 additions & 56 deletions dist/js/mui.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,4 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/**
* MUI CSS/JS main module
* @module main
*/

(function(win) {
'use strict';

// return if library has been loaded already
if (win._muiLoadedJS) return;
else win._muiLoadedJS = true;

// load dependencies
var jqLite = require('./lib/jqLite.js'),
util = require('./lib/util.js'),
formControl = require('./forms/form-control.js'),
select = require('./forms/select.js'),
ripple = require('./ripple.js'),
dropdowns = require('./dropdowns.js'),
tabs = require('./tabs.js'),
overlay = require('./overlay.js');

// expose api
win.mui = {
overlay: overlay
};

// init libraries
jqLite.ready(function() {
formControl.initListeners();
select.initListeners();
ripple.initListeners();
dropdowns.initListeners();
tabs.initListeners();
});
})(window);

},{"./dropdowns.js":3,"./forms/form-control.js":4,"./forms/select.js":5,"./lib/jqLite.js":6,"./lib/util.js":7,"./overlay.js":8,"./ripple.js":9,"./tabs.js":10}],2:[function(require,module,exports){
/**
* MUI config module
* @module config
Expand All @@ -48,7 +10,7 @@ module.exports = {
debug: true
};

},{}],3:[function(require,module,exports){
},{}],2:[function(require,module,exports){
/**
* MUI CSS/JS dropdown module
* @module dropdowns
Expand Down Expand Up @@ -115,19 +77,12 @@ function toggleDropdown(toggleEl) {
return util.raiseError('Dropdown menu element not found');
}

// method to ignore clicks inside menu
function stopPropagationFn(ev) {
ev.stopPropagation();
}

// method to close dropdown
function closeDropdownFn() {
jqLite.removeClass(menuEl, openClass);

// remove event handlers
jqLite.off(doc, 'click', closeDropdownFn);
jqLite.off(menuEl, 'click', stopPropagationFn);
jqLite.off(toggleEl, 'click', stopPropagationFn);
}

// method to open dropdown
Expand All @@ -143,8 +98,6 @@ function toggleDropdown(toggleEl) {
jqLite.addClass(menuEl, openClass);

// close dropdown when user clicks outside of menu
jqLite.on(toggleEl, 'click', stopPropagationFn);
jqLite.on(menuEl, 'click', stopPropagationFn);
jqLite.on(doc, 'click', closeDropdownFn);
}

Expand All @@ -171,7 +124,7 @@ module.exports = {
}
};

},{"./lib/jqLite.js":6,"./lib/util.js":7}],4:[function(require,module,exports){
},{"./lib/jqLite.js":5,"./lib/util.js":6}],3:[function(require,module,exports){
/**
* MUI CSS/JS form-control module
* @module forms/form-control
Expand Down Expand Up @@ -267,7 +220,7 @@ module.exports = {
}
};

},{"../lib/jqLite.js":6,"../lib/util.js":7}],5:[function(require,module,exports){
},{"../lib/jqLite.js":5,"../lib/util.js":6}],4:[function(require,module,exports){
/**
* MUI CSS/JS select module
* @module forms/select
Expand Down Expand Up @@ -613,7 +566,7 @@ module.exports = {
}
};

},{"../lib/jqLite.js":6,"../lib/util.js":7}],6:[function(require,module,exports){
},{"../lib/jqLite.js":5,"../lib/util.js":6}],5:[function(require,module,exports){
/**
* MUI CSS/JS jqLite module
* @module lib/jqLite
Expand Down Expand Up @@ -966,7 +919,7 @@ module.exports = {
type: jqLiteType
};

},{}],7:[function(require,module,exports){
},{}],6:[function(require,module,exports){
/**
* MUI CSS/JS utilities module
* @module lib/util
Expand Down Expand Up @@ -1151,7 +1104,45 @@ module.exports = {
supportsPointerEvents: supportsPointerEventsFn
};

},{"../config.js":2,"./jqLite.js":6}],8:[function(require,module,exports){
},{"../config.js":1,"./jqLite.js":5}],7:[function(require,module,exports){
/**
* MUI CSS/JS main module
* @module main
*/

(function(win) {
'use strict';

// return if library has been loaded already
if (win._muiLoadedJS) return;
else win._muiLoadedJS = true;

// load dependencies
var jqLite = require('./lib/jqLite.js'),
util = require('./lib/util.js'),
formControl = require('./forms/form-control.js'),
select = require('./forms/select.js'),
ripple = require('./ripple.js'),
dropdowns = require('./dropdowns.js'),
tabs = require('./tabs.js'),
overlay = require('./overlay.js');

// expose api
win.mui = {
overlay: overlay
};

// init libraries
jqLite.ready(function() {
formControl.initListeners();
select.initListeners();
ripple.initListeners();
dropdowns.initListeners();
tabs.initListeners();
});
})(window);

},{"./dropdowns.js":2,"./forms/form-control.js":3,"./forms/select.js":4,"./lib/jqLite.js":5,"./lib/util.js":6,"./overlay.js":8,"./ripple.js":9,"./tabs.js":10}],8:[function(require,module,exports){
/**
* MUI CSS/JS overlay module
* @module overlay
Expand Down Expand Up @@ -1342,7 +1333,7 @@ function onClick(ev) {
/** Define module API */
module.exports = overlayFn;

},{"./lib/jqLite.js":6,"./lib/util.js":7}],9:[function(require,module,exports){
},{"./lib/jqLite.js":5,"./lib/util.js":6}],9:[function(require,module,exports){
/**
* MUI CSS/JS ripple module
* @module ripple
Expand Down Expand Up @@ -1451,7 +1442,7 @@ module.exports = {
}
};

},{"./lib/jqLite.js":6,"./lib/util.js":7}],10:[function(require,module,exports){
},{"./lib/jqLite.js":5,"./lib/util.js":6}],10:[function(require,module,exports){
/**
* MUI CSS/JS tabs module
* @module tabs
Expand Down Expand Up @@ -1552,4 +1543,4 @@ module.exports = {
}
};

},{"./lib/jqLite.js":6,"./lib/util.js":7}]},{},[1]);
},{"./lib/jqLite.js":5,"./lib/util.js":6}]},{},[7]);

0 comments on commit ab210d6

Please sign in to comment.