Skip to content

Commit 82d4f8f

Browse files
author
Alexis Abril
committed
CONFLICT. Merging updated links with existing template.
2 parents c2c176a + 3b48925 commit 82d4f8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+15324
-5037
lines changed

‎_includes/builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h4><a href="#dom_helpers">DOM HELPERS</a> - faster and easier DOM manipulation
2323

2424
<label>
2525
<input type="checkbox" value="jquery/dom/form_params" name="plugins"/>
26-
<a href="#dimensions">jQuery.formParams</a> - serializes a form into an object
26+
<a href="#formparams">jQuery.formParams</a> - serializes a form into an object
2727
</label>
2828

2929
<label>

‎_layouts/default.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,6 @@
88
<link rel="stylesheet" type="text/css" href="stylesheets/styles.css">
99
<link rel="stylesheet" type="text/css" href="stylesheets/tango.css">
1010
<link href='/favicon.ico' rel='shortcut icon' type='image/x-icon' />
11-
<script type="text/javascript">
12-
13-
var _gaq = _gaq || [];
14-
_gaq.push(['_setAccount', 'UA-2302003-13']);
15-
_gaq.push(['_trackPageview']);
16-
17-
(function() {
18-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
19-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
20-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
21-
})();
22-
23-
</script>
2411
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
2512
</head>
2613
<body>
@@ -48,7 +35,7 @@
4835
</div>
4936
<div id='content-wrapper'>
5037
<div id='content'>
51-
<a href="http://github.com/jupiterjs/jquerypp" class="github-fork"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
38+
<a href="http://github.com/bitovi/jquerypp" class="github-fork"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
5239
{{ content }}
5340
</div>
5441
</div>
@@ -59,4 +46,4 @@
5946
<script src="javascripts/jquerypp.js" type="text/javascript"></script>
6047
<script src="javascripts/application.js" type="text/javascript"></script>
6148
</body>
62-
</html>
49+
</html>

‎index.md

Lines changed: 53 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: 1.0.1
55

66
# Hi, I'm jQuery++.
77

8-
I am a MIT licensed collection of extremely useful DOM helpers and special events for jQuery 1.7 and
8+
I am a MIT licensed collection of extremely useful DOM helpers and special events for jQuery 1.8 and
99
later. I'm not a UI project like [jQuery UI](http://jqueryui.com/) or
1010
[jQuery Tools](http://jquerytools.org/). Instead, I'm all about providing
1111
low-level utilities for things that jQuery doesn't support. If [Underscore](http://underscorejs.org/)
@@ -33,31 +33,14 @@ There are several ways to get and setup jQuery++:
3333

3434
Simply select the files you want and click "Download". This will create and download a `jquerypp.custom.js`
3535
with all the files you selected and their dependencies. Load this script
36-
after jQuery 1.7 like:
36+
after jQuery 1.8 like:
3737

3838
{% highlight html %}
39-
<script src="lib/jquery.1.7.2.js"></script>
39+
<script src="lib/jquery.1.8.2.js"></script>
4040
<script src="lib/jquerypp.custom.js"></script>
4141
{% endhighlight %}
4242

43-
### Using individual files
44-
45-
The `jquerypp.js` file from the [full download](http://jquerypp.com/downloads/jquerypp-{{page.version}}.zip)
46-
contains all jQuery++ plugins in a single file:
47-
48-
{% highlight html %}
49-
<script src="lib/jquery.1.7.2.js"></script>
50-
<script src="lib/jquerypp.js"></script>
51-
{% endhighlight %}
52-
53-
The `lib` folder contains each plugin as a separate file. There is a list of dependencies that need to be included first
54-
at the top of each file. For example, `jquery.animate.js` depends on `jquery.styles.js` so it needs to be loaded like this:
55-
56-
{% highlight html %}
57-
<script src="lib/jquery.1.7.2.js"></script>
58-
<script src="lib/jquery.styles.js"></script>
59-
<script src="lib/jquery.animate.js"></script>
60-
{% endhighlight %}
43+
<!--
6144
6245
### Using Steal
6346
@@ -77,13 +60,15 @@ using jQuery++ with [CanJS](http://canjs.us) and Steal:
7760
7861
{% highlight javascript %}
7962
steal.map({
80-
"jquery/jquery.js" : "can/util/jquery/jquery.1.7.1.js"
63+
"jquery/jquery.js" : "can/util/jquery/jquery.1.8.2.js"
8164
});
8265
{% endhighlight %}
8366
67+
-->
68+
8469
### Using AMD
8570

86-
The files to load the jQuery++ plugins with an [AMD](https://github.com/amdjs/amdjs-api/wiki/AMD) module loader like [RequireJS](http://requirejs.org/), are located in the `amd/` folder of the [full download](http://jquerypp.com/downloads/jquerypp-{{page.version}}.zip).
71+
The files to load the jQuery++ plugins with an [AMD](https://github.com/amdjs/amdjs-api/wiki/AMD) module loader like [RequireJS](http://requirejs.org/), are located in the `amd/` folder of the [full download](https://github.com/downloads/bitovi/jquerypp/jquerypp-{{page.version}}.zip).
8772
Place the `jquerypp/` folder in your module directory and load a plugin like this:
8873

8974
{% highlight javascript %}
@@ -98,7 +83,7 @@ You might have to map the `jquery` module name to the name of your jQuery AMD mo
9883
{% highlight javascript %}
9984
require.config({
10085
paths: {
101-
"jquery": "./jquery-1.7.2"
86+
"jquery" : "http://code.jquery.com/jquery-1.8.2"
10287
}
10388
});
10489
{% endhighlight %}
@@ -737,7 +722,7 @@ Bitovi _(developers of jQuery++)_ offers [training](http://bitovi.com/training/)
737722
jQuery++ does things the jQuery way, which makes it really easy to learn if you are already familiar with jQuery.
738723
Get functionality that was always tricky to implement from one coherent library:
739724

740-
- Set and animte outer and inner dimensions with [dimensions](#dimensions)
725+
- Set and animate outer and inner dimensions with [dimensions](#dimensions)
741726
- Serialize forms into objects with [formParams](#formparams)
742727
- [Drag](#drag) & [drop](#drop) events - no need for jQuery UI
743728
- [Resize](#resize) elements the right way
@@ -778,7 +763,7 @@ Steal as submodules that are used to generate the documentation and build the jQ
778763

779764
1. Clone DoneJS with:
780765

781-
git clone git://github.com/jupiterjs/donejs
766+
git clone git://github.com/bitovi/donejs
782767

783768
2. Install all submodules by running
784769

@@ -787,7 +772,7 @@ Steal as submodules that are used to generate the documentation and build the jQ
787772

788773
Depending on your version of git, you might need to cd into each submodule and run `git checkout`.
789774

790-
3. Fork [jquerypp](https://github.com/jupiterjs/jquerypp) on Github
775+
3. Fork [jquerypp](https://github.com/bitovi/jquerypp) on Github
791776

792777
4. Add your own fork as a remote in the `jquery` submodule:
793778

@@ -820,7 +805,7 @@ To develop jQuery++:
820805
### Documentation
821806

822807
To edit jquerypp.com, installing jQuery++ and DoneJS is not necessary. Simply *fork* and edit the
823-
github pages's [index.md page](https://github.com/jupiterjs/jquerypp/blob/gh-pages/index.md) online. Don't forget to
808+
github pages's [index.md page](https://github.com/bitovi/jquerypp/blob/gh-pages/index.md) online. Don't forget to
824809
submit a pull request.
825810

826811
To edit the documentation at [DoneJS.com](http://doneJS.com/docs.html):
@@ -841,37 +826,65 @@ To make a jQuery++ build, run:
841826

842827
js jquery/build/make.js
843828

844-
It puts the downloads in `jquery/dist`. To build a specific version check out the [git tag](https://github.com/jupiterjs/jquerypp/tags)
829+
It puts the downloads in `jquery/dist`. To build a specific version check out the [git tag](https://github.com/bitovi/jquerypp/tags)
845830
you want to build and run the above command.
846831

847832
### List of heroes
848833

849834
The following lists everyone who's contributed something to CanJS. If we've forgotten you, please add yourself.
850835

851-
First, thanks to everyone who's contributed to [JavaScriptMVC](https://github.com/jupiterjs/javascriptmvc/contributors)
836+
First, thanks to everyone who's contributed to [JavaScriptMVC](https://github.com/bitovi/javascriptmvc/contributors)
852837
and [jQueryMX](https://github.com/jupiterjs/jquerymx/contributors), and the people at
853838
[Bitovi](http://bitovi.com/people/). This page is for contributors after jQuery++'s launch:
854839

855-
[callumacrae](https://github.com/callumacrae) - [Width property for jQuery.selection](https://github.com/jupiterjs/jquerypp/pull/11) and documentation fixes.
840+
[callumacrae](https://github.com/callumacrae) - [Width property for jQuery.selection](https://github.com/bitovi/jquerypp/pull/11) and documentation fixes.
856841
[fabianonunes](https://github.com/fabianonunes) - Fixed several errors in the build process.
842+
[jbrumwell](https://github.com/jbrumwell) - Added several useful features for drag/drop events and
843+
[jeffrose](https://github.com/jeffrose) - [1](https://github.com/bitovi/jquerypp/pull/68)
844+
[iamnoah](https://github.com/iamnoah) - [1](https://github.com/bitovi/jquerypp/pull/65)
857845

858846
### Change Log
859847

848+
__1.0.1__ (February 6th 2013)
849+
850+
- fix: [Force hover leave on new mouseenter](https://github.com/bitovi/jquerypp/pull/65)
851+
- fix: [Removing the element being hovered prevents all future hoverenter](https://github.com/bitovi/jquerypp/issues/64)
852+
- fix: [hover.leave != 0 prevents hover of next element with same selecto](https://github.com/bitovi/jquerypp/issues/63)
853+
- fix: [Changing jQuery references to local $](https://github.com/bitovi/jquerypp/pull/71)
854+
- fix: [Breaks in jQuery.noConflict(true) Scenario](https://github.com/bitovi/jquerypp/issues/67)
855+
- fix: [Can't download drag.limit, drag.step, and drag.scroll from downloader on website](https://github.com/bitovi/jquerypp/pull/66)
856+
- feature: [jQuery 1.9.x support](https://github.com/bitovi/jquerypp/commit/692ed50a7b43fb2c6bfb9d89c5e0505ddcbd6595)
857+
- feature: Added to the new [jQuery plugin repository](http://plugins.jquery.com/jquerypp)
858+
859+
__1.0.0__ (November 20th 2012)
860+
861+
- feature: jQuery 1.8.0+ compatibility
862+
- feature: [dragcleanup event](https://github.com/bitovi/jquerypp/pull/43)
863+
- feature: [Reverse and move event](https://github.com/bitovi/jquerypp/issues/25)
864+
- fix: [pass through scrollTop in animate](https://github.com/bitovi/jquerypp/pull/40)
865+
- fix: [Fastfix: Original can be undefined](https://github.com/bitovi/jquerypp/pull/45)
866+
- fix: [Animate Scroll not working](https://github.com/bitovi/jquerypp/issues/35)
867+
- fix: [.stop() does not stop callbacks from being executed](https://github.com/bitovi/jquerypp/issues/28)
868+
- fix: [jQuery.event.swipe.max isn't actually being used](https://github.com/bitovi/jquerypp/issues/33)
869+
- fix: [Range triggers error on IE8](https://github.com/bitovi/jquerypp/issues/39)
870+
- fix: [[FormParams] convertValue function: Null value to undefined (Internet Explorer Fix)](https://github.com/bitovi/jquerypp/pull/51)
871+
- fix: [HoverInit delay 0 does not trigger hoverenter if immediately moused out](https://github.com/bitovi/jquerypp/issues/57)
872+
860873
__1.0 Beta 2__
861874

862-
- feature: [Key mapping tool for jQuery.event.key for international characters](https://github.com/jupiterjs/jquerypp/issues/16)
863-
- fix: [jQuery.formParams converts disabled fields](https://github.com/jupiterjs/jquerypp/issues/24)
864-
- fix: [jQuery.animate supports all parameters](https://github.com/jupiterjs/jquerypp/issues/22)
865-
- change: [jQuery.event.drag supports touch events](https://github.com/jupiterjs/jquerypp/issues/23)
866-
- fix: [jQuery.animate .stop() doesn't work](https://github.com/jupiterjs/jquerypp/issues/19)
867-
- fix: [Bug with duplicate sub keys](https://github.com/jupiterjs/jquerypp/issues/17)
868-
- change: [Added width property to jQuery.selection](https://github.com/jupiterjs/jquerypp/pull/11)
869-
- fix: [Security error in jQuery.animate](https://github.com/jupiterjs/jquerypp/issues/5)
875+
- feature: [Key mapping tool for jQuery.event.key for international characters](https://github.com/bitovi/jquerypp/issues/16)
876+
- fix: [jQuery.formParams converts disabled fields](https://github.com/bitovi/jquerypp/issues/24)
877+
- fix: [jQuery.animate supports all parameters](https://github.com/bitovi/jquerypp/issues/22)
878+
- change: [jQuery.event.drag supports touch events](https://github.com/bitovi/jquerypp/issues/23)
879+
- fix: [jQuery.animate .stop() doesn't work](https://github.com/bitovi/jquerypp/issues/19)
880+
- fix: [Bug with duplicate sub keys](https://github.com/bitovi/jquerypp/issues/17)
881+
- change: [Added width property to jQuery.selection](https://github.com/bitovi/jquerypp/pull/11)
882+
- fix: [Security error in jQuery.animate](https://github.com/bitovi/jquerypp/issues/5)
870883
- *jquerypp.com*
871884
- jsFiddle examples for [cookie](#cookie), [compare](#compare), [range](#range), [styles](#styles) and [key](#key)
872885
- Links to annotated sources ([e.g. jQuery.animate](http://donejs.com/jquery/docs/jquery.animate.html))
873886
- Changelog and list of heroes section
874887

875888
__1.0 Beta__ (June 1st 2012)
876889

877-
- Released!
890+
- Released!

‎javascripts/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ $('a[href$=#dom_helpers], a[href$=#events]').prepend('<span class="special">&#x2
375375

376376
// google analytics
377377
var _gaq = _gaq || [];
378-
_gaq.push(['_setAccount', 'UA-2302003-11']);
378+
_gaq.push(['_setAccount', 'UA-2302003-13']);
379379
_gaq.push(['_trackPageview']);
380380

381381
(function() {

0 commit comments

Comments
 (0)