Skip to content
Permalink
Browse files

merged master

  • Loading branch information
ralsina committed Apr 16, 2016
2 parents 21b6f14 + 027a040 commit 715b45b5f4916a3cd0b9367a2404849df72a9b28
Showing with 8,660 additions and 348 deletions.
  1. +16 −1 CHANGES.txt
  2. +4 −4 bower_components/jquery/.bower.json
  3. +3 −0 bower_components/jquery/AUTHORS.txt
  4. +63 −3 bower_components/jquery/README.md
  5. +17 −18 bower_components/jquery/dist/jquery.js
  6. +5 −5 bower_components/jquery/dist/jquery.min.js
  7. +1 −1 bower_components/jquery/dist/jquery.min.map
  8. +7,877 −0 bower_components/jquery/dist/jquery.slim.js
  9. +4 −0 bower_components/jquery/dist/jquery.slim.min.js
  10. +1 −0 bower_components/jquery/dist/jquery.slim.min.map
  11. +14 −0 bower_components/jquery/src/core/DOMEval.js
  12. +4 −5 bower_components/jquery/src/core/ready.js
  13. +8 −5 bower_components/jquery/src/css/curCSS.js
  14. +2 −2 bower_components/jquery/src/css/var/getStyles.js
  15. +44 −45 bower_components/jquery/src/data/Data.js
  16. +2 −2 bower_components/jquery/src/data/var/dataPriv.js
  17. +2 −2 bower_components/jquery/src/data/var/dataUser.js
  18. +19 −0 bower_components/jquery/src/deferred/exceptionHook.js
  19. +53 −0 bower_components/jquery/src/event/focusin.js
  20. +199 −0 bower_components/jquery/src/event/trigger.js
  21. +2 −5 bower_components/jquery/src/offset.js
  22. +99 −64 bower_components/jquery/src/selector-native.js
  23. +1 −1 bower_components/jquery/src/selector-sizzle.js
  24. +2 −2 bower_components/jquery/src/var/arr.js
  25. +2 −2 docs/extending.txt
  26. BIN docs/man/nikola.1.gz
  27. +1 −1 docs/man/nikola.rst
  28. +1 −1 docs/manual.txt
  29. +2 −2 docs/path_handlers.txt
  30. +1 −1 docs/social_buttons.txt
  31. +2 −2 docs/sphinx/conf.py
  32. +1 −1 docs/theming.txt
  33. +1 −1 nikola/__init__.py
  34. +1 −1 nikola/data/samplesite/stories/quickstart.rst
  35. +3 −0 nikola/data/symlinked.txt
  36. +8 −8 nikola/data/themes/base/messages/messages_id.py
  37. +3 −3 nikola/data/themes/base/messages/messages_uk.py
  38. +1 −0 nikola/data/themes/bootstrap3/assets/js/jquery.slim.js
  39. +1 −0 nikola/data/themes/bootstrap3/assets/js/jquery.slim.min.js
  40. +1 −0 nikola/data/themes/bootstrap3/assets/js/jquery.slim.min.map
  41. +5 −5 nikola/image_processing.py
  42. +22 −14 nikola/nikola.py
  43. +4 −3 nikola/plugins/command/import_wordpress.py
  44. +2 −2 nikola/plugins/command/new_post.py
  45. +9 −6 nikola/plugins/task/authors.py
  46. +1 −1 nikola/plugins/task/galleries.py
  47. +94 −86 nikola/plugins/task/tags.py
  48. +7 −6 nikola/post.py
  49. +14 −8 nikola/utils.py
  50. +2 −2 requirements-tests.txt
  51. +2 −2 scripts/document_path_handlers.py
  52. +1 −1 scripts/set_version.py
  53. +1 −1 setup.py
  54. +1 −0 tests/base.py
  55. +8 −8 tests/test_slugify.py
  56. +1 −1 tests/test_utils.py
  57. +9 −9 translations/nikola.messages/id.po
  58. +6 −5 translations/nikola.messages/uk.po
@@ -4,6 +4,21 @@ New in master
Features
--------

Bugfixes
--------

* Don't call sys.exit() from plugins if possible (Issue #1839)
* Warn if a tag appears multiple times in a post (Issue #2315)
* Use binary I/O for ``.svg`` files in galleries
* Accept ``.svgz`` extension by default
* Don't randomly load plugins when Nikola is called with no arguments (Issue #2297)

New in v7.7.7
=============

Features
--------

* New ``--one-file`` option to wordpress importer (Issue #2262)
* New Pygal-based chart shortcode (Issue #2170)
* Add ``post_type`` to post-list directive (Issue #2272)
@@ -12,7 +27,7 @@ Features
Bugfixes
--------

* Don't call sys.exit() from plugins if possible (Issue #1839)
* Fix Indonesian translation (Issue #2291)
* Fix a JSON conversion bug in the WordPress importer (Issue #2264)
* Don’t create download directories when not downloading WordPress
attachments (Issue #2260)
@@ -12,12 +12,12 @@
"library"
],
"homepage": "https://github.com/jquery/jquery-dist",
"version": "1.12.0",
"_release": "1.12.0",
"version": "1.12.1",
"_release": "1.12.1",
"_resolution": {
"type": "version",
"tag": "1.12.0",
"commit": "efbdc6e3f0fa3d3cd4d3d8bfa37990b707f7c2e1"
"tag": "1.12.1",
"commit": "56ead6ffbf8560c521e7e94518d35db42b19f5f3"
},
"_source": "git://github.com/jquery/jquery-dist.git",
"_target": "<2.0.0",
@@ -261,3 +261,6 @@ Liza Ramo <liza.h.ramo@gmail.com>
Joelle Fleurantin <joasqueeniebee@gmail.com>
Julian Alexander Murillo <julian.alexander.murillo@gmail.com>
Jun Sun <klsforever@gmail.com>
Devin Wilson <dwilson6.github@gmail.com>
Todor Prikumov <tono_pr@abv.bg>
Zack Hall <zackhall@outlook.com>
@@ -1,5 +1,65 @@
# jQuery Dist
# jQuery

This repo only contains package distribution files for jQuery Core.
> jQuery is a fast, small, and feature-rich JavaScript library.
For source files and issues, visit the [jQuery repo](https://github.com/jquery/jquery).
For information on how to get started and how to use jQuery, please see [jQuery's documentation](http://api.jquery.com/).
For source files and issues, please visit the [jQuery repo](https://github.com/jquery/jquery).

## Including jQuery

Below are some of the most common ways to include jQuery.

### Browser

#### Script tag

```html
<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
```

#### Babel

[Babel](http://babeljs.io/) is a next generation JavaScript compiler. One of the features is the ability to use ES6/ES2015 modules now, even though browsers do not yet support this feature natively.

```js
import $ from "jquery";
```

#### Browserify/Webpack

There are several ways to use [Browserify](http://browserify.org/) and [Webpack](https://webpack.github.io/). For more information on using these tools, please refer to the corresponding project's documention. In the script, including jQuery will usually look like this...

```js
var $ = require("jquery");
```

#### AMD (Asynchronous Module Definition)

AMD is a module format built for the browser. For more information, we recommend [require.js' documentation](http://requirejs.org/docs/whyamd.html).

```js
define(["jquery"], function($) {
});
```

### Node

To include jQuery in [Node](nodejs.org), first install with npm.

```sh
npm install jquery
```

For jQuery to work in Node, a window with a document is required. Since no such window exists natively in Node, one can be mocked by tools such as [jsdom](https://github.com/tmpvar/jsdom). This can be useful for testing purposes.

```js
require("jsdom").env("", function(err, window) {
if (err) {
console.error(err);
return;
}
var $ = require("jquery")(window);
});
```
@@ -1,5 +1,5 @@
/*!
* jQuery JavaScript Library v1.12.0
* jQuery JavaScript Library v1.12.1
* http://jquery.com/
*
* Includes Sizzle.js
@@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2016-01-08T19:56Z
* Date: 2016-02-22T19:07Z
*/

(function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};


var
version = "1.12.0",
version = "1.12.1",

// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -3625,11 +3625,10 @@ jQuery.ready.promise = function( obj ) {

// Catch cases where $(document).ready() is called
// after the browser event has already occurred.
// we once tried to use readyState "interactive" here,
// but it caused issues like the one
// discovered by ChrisS here:
// http://bugs.jquery.com/ticket/12282#comment:15
if ( document.readyState === "complete" ) {
// Support: IE6-10
// Older IE sometimes signals "interactive" too soon
if ( document.readyState === "complete" ||
( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {

// Handle it asynchronously to allow scripts the opportunity to delay ready
window.setTimeout( jQuery.ready );
@@ -6701,7 +6700,7 @@ if ( window.getComputedStyle ) {
// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
var view = elem.ownerDocument.defaultView;

if ( !view.opener ) {
if ( !view || !view.opener ) {
view = window;
}

@@ -6717,11 +6716,14 @@ if ( window.getComputedStyle ) {
// getPropertyValue is only needed for .css('filter') in IE9, see #12537
ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;

if ( computed ) {
// Support: Opera 12.1x only
// Fall back to style even without computed
// computed is undefined for elems on document fragments
if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
ret = jQuery.style( elem, name );
}

if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
ret = jQuery.style( elem, name );
}
if ( computed ) {

// A tribute to the "awesome hack by Dean Edwards"
// Chrome < 17 and Safari 5.0 uses "computed value"
@@ -10818,11 +10820,8 @@ jQuery.fn.extend( {
}

// Add offsetParent borders
// Subtract offsetParent scroll positions
parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) -
offsetParent.scrollTop();
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) -
offsetParent.scrollLeft();
parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
}

// Subtract parent offsets and element margins

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 715b45b

Please sign in to comment.
You can’t perform that action at this time.