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

Commit

Permalink
chore(build): Build v0.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianlee44 committed Mar 12, 2014
1 parent 7bf8d71 commit 170bb0f
Show file tree
Hide file tree
Showing 18 changed files with 43 additions and 21 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v0.2.5 (2014/3/12)
## Features
- **macModal:** Added option to disable positioning by modal service
([527d3aee](https://github.com/StartTheShift/MacGyver/commit/527d3aee1e1ced8c13846bb0e9062ae2b212216c))


# v0.2.4 (2014/3/6)
## Bug Fixes
- **macTableSelectable:** Reset selection controls when window regains focus
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MacGyver",
"version": "0.2.4",
"version": "0.2.5",
"main": [
"lib/img/ui-bg_flat_0_aaaaaa_40x100.png",
"lib/img/ui-bg_glass_75_ffffff_1x400.png",
Expand Down Expand Up @@ -42,4 +42,4 @@
"angular-animate": "1.2.13",
"underscore.string": "~2.3.3"
}
}
}
2 changes: 1 addition & 1 deletion example/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h3>Example</h3><div class="docs-example"><input type="text" mac-pause-typing="a
<p>Binding custom behavior on window resize event </p>
<h3 id="parameters">Parameters</h3>
<p><strong>mac-window-resize</strong><br>Type: <code>Expression</code><br>Expression to evaluate on window resize </p>
<h3>Example</h3><div class="docs-example"><div mac-window-resize="windowResizing($event)">Current width: {{windowWidth}}</div></div></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.4</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.2/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.2/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
<h3>Example</h3><div class="docs-example"><div mac-window-resize="windowResizing($event)">Current width: {{windowWidth}}</div></div></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.5</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.13/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.13/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
Expand Down
2 changes: 1 addition & 1 deletion example/filters.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h3 id="parameters">Parameters</h3>
<p><strong>separator</strong><br>Type: <code>String</code><br>String to separate each element of the array (default ,) </p>
<h3 id="returns">Returns</h3>
<p>Type: <code>String</code><br>Formatted string </p>
<h3>Example</h3><div class="docs-example"><p>{{ ["item1", "item2", "item3", "item4"] | list }}</p></div><pre class="prettyprint linenums">{{ [&quot;item1&quot;, &quot;item2&quot;, &quot;item3&quot;, &quot;item4&quot;] | list }}</pre></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.4</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.2/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.2/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
<h3>Example</h3><div class="docs-example"><p>{{ ["item1", "item2", "item3", "item4"] | list }}</p></div><pre class="prettyprint linenums">{{ [&quot;item1&quot;, &quot;item2&quot;, &quot;item3&quot;, &quot;item4&quot;] | list }}</pre></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.5</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.13/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.13/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
Expand Down
5 changes: 3 additions & 2 deletions example/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><title>MacGyver Example</title><link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet"><link href="//fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css"><link href="css/vendor.css" rel="stylesheet"><link href="css/macgyver.css" rel="stylesheet"></head><body ng-app="Mac" mac-scroll-spy mac-scroll-spy-offset="10"><div id="top-nav"><div class="container"><a id="logo" href="index.html"><h2>MacGyver</h2></a><ul class="nav-menu"><li id="directives-nav"><a href="index.html">Directives</a></li><li id="tableview-nav"><a href="tableview.html">Table View</a></li><li id="filters-nav"><a href="filters.html">Filters</a></li><li id="events-nav"><a href="events.html">Events</a></li><li id="utils-nav"><a href="util.html">Utilities</a></li></ul></div></div><div id="header" class="macgyver-head"><h1 class="hero">MacGyver</h1><ul class="macgyver-links"><li><a href="https://github.com/StartTheShift/MacGyver">Github project</a></li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li><li>Version 0.2.4</li></ul><span><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs have moved</a></span><div class="github-info"><ul><li><iframe src="http://ghbtns.com/github-btn.html?user=StartTheShift&amp;repo=MacGyver&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe></li><li><iframe src="http://ghbtns.com/github-btn.html?user=StartTheShift&amp;repo=MacGyver&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe></li></ul></div></div><div class="container"><div ng-controller="ExampleController" class="row content"><div id="nav" class="span3"><ul mac-affix mac-affix-top="188" class="nav nav-list docs-sidenav"><li mac-scroll-spy-target="modal"><a href="#modal"><i class="icon-chevron-right"></i>Modal</a></li><li mac-scroll-spy-target="scrollspy"><a href="#scrollspy"><i class="icon-chevron-right"></i>Scroll Spy</a></li><li mac-scroll-spy-target="affix"><a href="#affix"><i class="icon-chevron-right"></i>Affix</a></li><li mac-scroll-spy-target="tooltip"><a href="#tooltip"><i class="icon-chevron-right"></i>Tooltip</a></li><li mac-scroll-spy-target="popover"><a href="#popover"><i class="icon-chevron-right"></i>Popover</a></li><li mac-scroll-spy-target="menu"><a href="#menu"><i class="icon-chevron-right"></i>Menu</a></li><li mac-scroll-spy-target="autocomplete"><a href="#autocomplete"><i class="icon-chevron-right"></i>Autocomplete</a></li><li mac-scroll-spy-target="tag-autocomplete"><a href="#tag-autocomplete"><i class="icon-chevron-right"></i>Tag Autocomplete</a></li><li mac-scroll-spy-target="datepicker"><a href="#datepicker"><i class="icon-chevron-right"></i>Date Picker</a></li><li mac-scroll-spy-target="time-input"><a href="#time-input"><i class="icon-chevron-right"></i>Time Input</a></li><li mac-scroll-spy-target="spinner"><a href="#spinner"><i class="icon-chevron-right"></i>Spinner</a></li><li mac-scroll-spy-target="cspinner"><a href="#cspinner"><i class="icon-chevron-right"></i>Canvas Spinner</a></li><li mac-scroll-spy-target="file-upload"><a href="#file-upload"><i class="icon-chevron-right"></i>File Upload</a></li><li mac-scroll-spy-target="placeholder"><a href="#placeholder"><i class="icon-chevron-right"></i>Placeholder</a></li></ul></div><div id="example" class="span9"><section id="modal" mac-scroll-spy-anchor><h1 id="modal-service">Modal Service</h1>
<!DOCTYPE html><html><head><meta charset="utf-8"><title>MacGyver Example</title><link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet"><link href="//fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css"><link href="css/vendor.css" rel="stylesheet"><link href="css/macgyver.css" rel="stylesheet"></head><body ng-app="Mac" mac-scroll-spy mac-scroll-spy-offset="10"><div id="top-nav"><div class="container"><a id="logo" href="index.html"><h2>MacGyver</h2></a><ul class="nav-menu"><li id="directives-nav"><a href="index.html">Directives</a></li><li id="tableview-nav"><a href="tableview.html">Table View</a></li><li id="filters-nav"><a href="filters.html">Filters</a></li><li id="events-nav"><a href="events.html">Events</a></li><li id="utils-nav"><a href="util.html">Utilities</a></li></ul></div></div><div id="header" class="macgyver-head"><h1 class="hero">MacGyver</h1><ul class="macgyver-links"><li><a href="https://github.com/StartTheShift/MacGyver">Github project</a></li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li><li>Version 0.2.5</li></ul><span><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs have moved</a></span><div class="github-info"><ul><li><iframe src="http://ghbtns.com/github-btn.html?user=StartTheShift&amp;repo=MacGyver&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe></li><li><iframe src="http://ghbtns.com/github-btn.html?user=StartTheShift&amp;repo=MacGyver&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe></li></ul></div></div><div class="container"><div ng-controller="ExampleController" class="row content"><div id="nav" class="span3"><ul mac-affix mac-affix-top="188" class="nav nav-list docs-sidenav"><li mac-scroll-spy-target="modal"><a href="#modal"><i class="icon-chevron-right"></i>Modal</a></li><li mac-scroll-spy-target="scrollspy"><a href="#scrollspy"><i class="icon-chevron-right"></i>Scroll Spy</a></li><li mac-scroll-spy-target="affix"><a href="#affix"><i class="icon-chevron-right"></i>Affix</a></li><li mac-scroll-spy-target="tooltip"><a href="#tooltip"><i class="icon-chevron-right"></i>Tooltip</a></li><li mac-scroll-spy-target="popover"><a href="#popover"><i class="icon-chevron-right"></i>Popover</a></li><li mac-scroll-spy-target="menu"><a href="#menu"><i class="icon-chevron-right"></i>Menu</a></li><li mac-scroll-spy-target="autocomplete"><a href="#autocomplete"><i class="icon-chevron-right"></i>Autocomplete</a></li><li mac-scroll-spy-target="tag-autocomplete"><a href="#tag-autocomplete"><i class="icon-chevron-right"></i>Tag Autocomplete</a></li><li mac-scroll-spy-target="datepicker"><a href="#datepicker"><i class="icon-chevron-right"></i>Date Picker</a></li><li mac-scroll-spy-target="time-input"><a href="#time-input"><i class="icon-chevron-right"></i>Time Input</a></li><li mac-scroll-spy-target="spinner"><a href="#spinner"><i class="icon-chevron-right"></i>Spinner</a></li><li mac-scroll-spy-target="cspinner"><a href="#cspinner"><i class="icon-chevron-right"></i>Canvas Spinner</a></li><li mac-scroll-spy-target="file-upload"><a href="#file-upload"><i class="icon-chevron-right"></i>File Upload</a></li><li mac-scroll-spy-target="placeholder"><a href="#placeholder"><i class="icon-chevron-right"></i>Placeholder</a></li></ul></div><div id="example" class="span9"><section id="modal" mac-scroll-spy-anchor><h1 id="modal-service">Modal Service</h1>
<p>There are multiple components used by modal. </p>
<ul>
<li>A modal service is used to keep state of modal opened in the applications. </li>
Expand Down Expand Up @@ -50,6 +50,7 @@ <h3 id="parameters">Parameters</h3>
<p><strong>mac-modal-after-show</strong><br>Type: <code>Expr</code><br>Callback when modal is visible with CSS transitions completed </p>
<p><strong>mac-modal-before-hide</strong><br>Type: <code>Expr</code><br>Callback before hiding the modal </p>
<p><strong>mac-modal-after-hide</strong><br>Type: <code>Expr</code><br>Callback when modal is hidden from the user with CSS transitions completed </p>
<p><strong>mac-modal-position</strong><br>Type: <code>Boolean</code><br>Calculate size and position with JS (default true) </p>
<h2 id="mac-modal-attribute-">mac-modal (attribute)</h2>
<p>Modal attribute directive to trigger modal dialog </p>
<h3 id="parameters">Parameters</h3>
Expand Down Expand Up @@ -468,7 +469,7 @@ <h3>Example</h3><div class="docs-example example-hit-area"><form action="..." me
<p>Dynamically fill out the placeholder text of input </p>
<h3 id="parameters">Parameters</h3>
<p><strong>mac-placeholder</strong><br>Type: <code>String</code><br>Variable that contains the placeholder text </p>
<h3>Example</h3><div class="docs-example"><input type="text" mac-placeholder="tagAutocompletePlaceholder"></div><pre class="prettyprint linenums">&lt;input type=&quot;text&quot; mac-placeholder=&quot;placeholderVariable&quot;&gt;</pre></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.4</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.2/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.2/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
<h3>Example</h3><div class="docs-example"><input type="text" mac-placeholder="tagAutocompletePlaceholder"></div><pre class="prettyprint linenums">&lt;input type=&quot;text&quot; mac-placeholder=&quot;placeholderVariable&quot;&gt;</pre></section></div></div></div><footer class="footer"><div class="container"><p>Built by the Dev team at&nbsp;<a href="http://www.shift.com">SHIFT.com</a></p><p>Code licensed under&nbsp;<a href="https://github.com/StartTheShift/MacGyver/blob/master/LICENSE">MIT</a></p></div><ul class="footer-links"><li>Currently 0.2.5</li><li>·</li><li><a href="http://starttheshift.github.io/MacGyver/example/0.1.28/">MacGyver 0.1.28 docs</a></li><li>·</li><li><a href="https://github.com/StartTheShift/MacGyver/issues">Issues</a></li></ul></footer><script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.js" type="text/javascript"></script><script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.13/angular.min.js" type="text/javascript"></script><script src="//cdnjs.cloudflare.com/ajax/libs/underscore.string/2.3.3/underscore.string.min.js" type="text/javascript"></script><script src="//code.angularjs.org/1.2.13/angular-animate.js" type="text/javascript"></script><script src="js/MacGyver.js" type="text/javascript"></script><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
Expand Down
5 changes: 5 additions & 0 deletions example/js/MacGyver.js
Original file line number Diff line number Diff line change
Expand Up @@ -8718,6 +8718,7 @@ modal template
@param {Expr} mac-modal-after-show Callback when modal is visible with CSS transitions completed
@param {Expr} mac-modal-before-hide Callback before hiding the modal
@param {Expr} mac-modal-after-hide Callback when modal is hidden from the user with CSS transitions completed
@param {Boolean} mac-modal-position Calculate size and position with JS (default true)
*/

angular.module("Mac").directive("macModal", [
Expand Down Expand Up @@ -11333,6 +11334,9 @@ angular.module("Mac").service("modal", [
}
element = modalObject.element;
options = modalObject.options;
if (!options.position) {
return;
}
modal = angular.element(element[0].getElementsByClassName("modal")).attr("style", "");
height = modal.outerHeight();
width = modal.outerWidth();
Expand Down Expand Up @@ -11441,6 +11445,7 @@ angular.module("Mac").service("modal", [
keyboard: false,
overlayClose: false,
resize: true,
position: true,
open: angular.noop,
topOffset: 20,
attributes: {},
Expand Down
Loading

0 comments on commit 170bb0f

Please sign in to comment.