This commit is contained in:
Alex Corbi 2019-09-30 10:44:43 +02:00
parent 36c5cc15a7
commit f972d8d46e
176 changed files with 62106 additions and 59068 deletions

View file

@ -0,0 +1,31 @@
---
layout: event
categories : [session]
number: 86
title:
date_text: "October 10th, 2019"
date_yyyy_mm_dd: "2019-10-10"
location: "SomoS"
location_website: "http://www.somos-arts.org/"
fb_event_url: "https://www.facebook.com/events/914606732245153/"
fb_gallery_id:
talks:
- title: "Chance, Artificial Intelligence and Computer Art"
topics: "computer art, chance, creative ai"
artist: "Fabrizio Augusto Poltronieri"
speakers: "Fabrizio Augusto Poltronieri"
description: "Fabrizio Poltronieri is an artist who explores the relationship between technology and deep-rooted philosophical concepts, such as chance. His current artwork involves Artificial Intelligence, applying machine and deep learning techniques to create and design narratives, moving images and objects. Poltronieri dedicates his artistic and academic research to the development of creative computing. He is a self-taught programmer who started to code during his childhood. His first degree was in Maths, he has a Master Degree in Education and Culture and holds a PhD in Semiotics from the Pontifical Catholic University of São Paulo (PUC/SP). Poltronieri is a senior lecturer and permanent member of the IOCT (Institute of Creative Technologies) at De Montfort University, Leicester, UK, supervising PhD students and teaching creative code in the Digital Arts MA. His theoretical texts and essays are often published in international books and journals, such as the Revista Brasileira (Brazilian Academy of Letters). He has written chapters for the books Rethinking gamification and The permanence of the transient: precariousness in art, of which he was also the co-editor. He is also the co-author of the book Explorations in art and technology and winner of the Itaú Rumos Arte Cibernética 2011 award with the Amigóide robot. In 2018 he won this prize again to develop the artwork “Apparatus Memories”."
artist_website: "http://www.fabriziopoltronieri.com"
media_artist_url: "/images/fabrizio_poltronieri.jpg"
video_artist_url:
talk_video_url:
- title: "How to feel slightly less akward as a human in virtual and non-virtual realities"
topics: "being human, feeling akward, creating a community, virtual reality"
artist: "Rita Eperjesi"
speakers: "Rita Eperjesi"
description: "Rita Eperjesi is a Berlin/Budapest based Hungarian new media artist/art director. She is the founder of the Creative Code community in Budapest, won several competitions for young creatives in advertising, and works with virtual reality in her free time. What she cares about the most are humans, technology and ideas. And the combinations of these: ideas moving humans. humans connecting to other humans. machines making better humans. robots generating ideas. She also likes shiny textures, bubbles an clouds."
artist_website: "http://rita.cloud"
media_artist_url: "/images/uszi.jpg"
video_artist_url: "https://vimeo.com/175142950"
talk_video_url:
---

View file

@ -1,12 +0,0 @@
# A sample Gemfile
source "https://rubygems.org"
# gem "rails"
gem "mini_magick"
gem "faraday"
gem "kramdown"
gem "jekyll-watch"
# group :jekyll_plugins do
# gem "image-reference-update"
# end

View file

@ -1,29 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
jekyll-watch (1.3.1)
listen (~> 3.0)
kramdown (1.10.0)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mini_magick (4.5.1)
multipart-post (2.0.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
PLATFORMS
ruby
DEPENDENCIES
faraday
jekyll-watch
kramdown
mini_magick
BUNDLED WITH
1.11.2

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
/*! /*!
* Bootstrap's Gruntfile * Bootstrap's Gruntfile
* http://getbootstrap.com * http://getbootstrap.com
* Copyright 2013-2016 Twitter, Inc. * Copyright 2013-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@ -17,6 +17,7 @@ module.exports = function (grunt) {
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var npmShrinkwrap = require('npm-shrinkwrap');
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js'); var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js'); var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
var getLessVarsData = function () { var getLessVarsData = function () {
@ -129,7 +130,7 @@ module.exports = function (grunt) {
warnings: false warnings: false
}, },
mangle: true, mangle: true,
preserveComments: /^!|@preserve|@license|@cc_on/i preserveComments: 'some'
}, },
core: { core: {
src: '<%= concat.bootstrap.dest %>', src: '<%= concat.bootstrap.dest %>',
@ -230,8 +231,6 @@ module.exports = function (grunt) {
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie8', compatibility: 'ie8',
keepSpecialComments: '*', keepSpecialComments: '*',
sourceMap: true,
sourceMapInlineSources: true,
advanced: false advanced: false
}, },
minifyCore: { minifyCore: {
@ -244,7 +243,6 @@ module.exports = function (grunt) {
}, },
docs: { docs: {
src: [ src: [
'docs/assets/css/ie10-viewport-bug-workaround.css',
'docs/assets/css/src/pygments-manni.css', 'docs/assets/css/src/pygments-manni.css',
'docs/assets/css/src/docs.css' 'docs/assets/css/src/docs.css'
], ],
@ -277,7 +275,7 @@ module.exports = function (grunt) {
copy: { copy: {
fonts: { fonts: {
expand: true, expand: true,
src: 'fonts/**', src: 'fonts/*',
dest: 'dist/' dest: 'dist/'
}, },
docs: { docs: {
@ -301,9 +299,7 @@ module.exports = function (grunt) {
jekyll: { jekyll: {
options: { options: {
bundleExec: true, config: '_config.yml'
config: '_config.yml',
incremental: false
}, },
docs: {}, docs: {},
github: { github: {
@ -316,27 +312,12 @@ module.exports = function (grunt) {
htmlmin: { htmlmin: {
dist: { dist: {
options: { options: {
collapseBooleanAttributes: true,
collapseWhitespace: true, collapseWhitespace: true,
conservativeCollapse: true, conservativeCollapse: true,
decodeEntities: false, minifyCSS: true,
minifyCSS: {
compatibility: 'ie8',
keepSpecialComments: 0
},
minifyJS: true, minifyJS: true,
minifyURLs: false,
processConditionalComments: true,
removeAttributeQuotes: true, removeAttributeQuotes: true,
removeComments: true, removeComments: true
removeOptionalAttributes: true,
removeOptionalTags: true,
removeRedundantAttributes: true,
removeScriptTypeAttributes: true,
removeStyleLinkTypeAttributes: true,
removeTagWhitespace: false,
sortAttributes: true,
sortClassName: true
}, },
expand: true, expand: true,
cwd: '_gh_pages', cwd: '_gh_pages',
@ -348,17 +329,17 @@ module.exports = function (grunt) {
} }
}, },
pug: { jade: {
options: { options: {
pretty: true, pretty: true,
data: getLessVarsData data: getLessVarsData
}, },
customizerVars: { customizerVars: {
src: 'docs/_pug/customizer-variables.pug', src: 'docs/_jade/customizer-variables.jade',
dest: 'docs/_includes/customizer-variables.html' dest: 'docs/_includes/customizer-variables.html'
}, },
customizerNav: { customizerNav: {
src: 'docs/_pug/customizer-nav.pug', src: 'docs/_jade/customizer-nav.jade',
dest: 'docs/_includes/nav/customize.html' dest: 'docs/_includes/nav/customize.html'
} }
}, },
@ -367,7 +348,7 @@ module.exports = function (grunt) {
options: { options: {
ignore: [ ignore: [
'Attribute "autocomplete" not allowed on element "button" at this point.', 'Attribute "autocomplete" not allowed on element "button" at this point.',
'Attribute "autocomplete" is only allowed when the input type is "color", "date", "datetime", "datetime-local", "email", "hidden", "month", "number", "password", "range", "search", "tel", "text", "time", "url", or "week".', 'Attribute "autocomplete" not allowed on element "input" at this point.',
'Element "img" is missing required attribute "src".' 'Element "img" is missing required attribute "src".'
] ]
}, },
@ -389,6 +370,25 @@ module.exports = function (grunt) {
} }
}, },
sed: {
versionNumber: {
pattern: (function () {
var old = grunt.option('oldver');
return old ? RegExp.quote(old) : old;
})(),
replacement: grunt.option('newver'),
exclude: [
'dist/fonts',
'docs/assets',
'fonts',
'js/tests/vendor',
'node_modules',
'test-infra'
],
recursive: true
}
},
'saucelabs-qunit': { 'saucelabs-qunit': {
all: { all: {
options: { options: {
@ -483,11 +483,16 @@ module.exports = function (grunt) {
// Default task. // Default task.
grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'test']); grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'test']);
// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', 'sed');
grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); }); grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); });
// task for building customizer // task for building customizer
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']); grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
grunt.registerTask('build-customizer-html', 'pug'); grunt.registerTask('build-customizer-html', 'jade');
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () { grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
var banner = grunt.template.process('<%= banner %>'); var banner = grunt.template.process('<%= banner %>');
generateRawFiles(grunt, banner); generateRawFiles(grunt, banner);
@ -505,7 +510,22 @@ module.exports = function (grunt) {
grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']); grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']);
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']); grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']);
grunt.registerTask('docs-github', ['jekyll:github', 'htmlmin']);
grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']); grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']);
// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', '_update-shrinkwrap']);
grunt.registerTask('_update-shrinkwrap', function () {
var done = this.async();
npmShrinkwrap({ dev: true, dirname: __dirname }, function (err) {
if (err) {
grunt.fail.warn(err);
}
var dest = 'test-infra/npm-shrinkwrap.json';
fs.renameSync('npm-shrinkwrap.json', dest);
grunt.log.writeln('File ' + dest.cyan + ' updated.');
done();
});
});
}; };

View file

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2011-2016 Twitter, Inc. Copyright (c) 2011-2015 Twitter, Inc
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View file

@ -1,40 +1,36 @@
# [Bootstrap](http://getbootstrap.com) # [Bootstrap](http://getbootstrap.com)
[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com)
![Bower version](https://img.shields.io/bower/v/bootstrap.svg) ![Bower version](https://img.shields.io/bower/v/bootstrap.svg)
[![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap) [![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap)
[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![NuGet](https://img.shields.io/nuget/v/bootstrap.svg)](https://www.nuget.org/packages/Bootstrap)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap) [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community. Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.
To get started, check out <http://getbootstrap.com>! To get started, check out <http://getbootstrap.com>!
## Table of contents ## Table of contents
* [Quick start](#quick-start) - [Quick start](#quick-start)
* [Bugs and feature requests](#bugs-and-feature-requests) - [Bugs and feature requests](#bugs-and-feature-requests)
* [Documentation](#documentation) - [Documentation](#documentation)
* [Contributing](#contributing) - [Contributing](#contributing)
* [Community](#community) - [Community](#community)
* [Versioning](#versioning) - [Versioning](#versioning)
* [Creators](#creators) - [Creators](#creators)
* [Copyright and license](#copyright-and-license) - [Copyright and license](#copyright-and-license)
## Quick start ## Quick start
Several quick start options are available: Several quick start options are available:
* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.7.zip). - [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.zip).
* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
* Install with [Bower](http://bower.io): `bower install bootstrap`. - Install with [Bower](http://bower.io): `bower install bootstrap`.
* Install with [npm](https://www.npmjs.com): `npm install bootstrap@3`. - Install with [npm](https://www.npmjs.com): `npm install bootstrap`.
* Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`. - Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`.
* Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`. - Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`.
Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
@ -48,11 +44,9 @@ bootstrap/
│ ├── bootstrap.css │ ├── bootstrap.css
│ ├── bootstrap.css.map │ ├── bootstrap.css.map
│ ├── bootstrap.min.css │ ├── bootstrap.min.css
│ ├── bootstrap.min.css.map
│ ├── bootstrap-theme.css │ ├── bootstrap-theme.css
│ ├── bootstrap-theme.css.map │ ├── bootstrap-theme.css.map
│ ├── bootstrap-theme.min.css │ └── bootstrap-theme.min.css
│ └── bootstrap-theme.min.css.map
├── js/ ├── js/
│ ├── bootstrap.js │ ├── bootstrap.js
│ └── bootstrap.min.js │ └── bootstrap.min.js
@ -67,12 +61,11 @@ bootstrap/
We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme. We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.
## Bugs and feature requests ## Bugs and feature requests
Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new). Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
Note that **feature requests must target [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev),** because Bootstrap v3 is now in maintenance mode and is closed off to new features. This is so that we can focus our efforts on Bootstrap v4.
## Documentation ## Documentation
@ -80,10 +73,11 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally ### Running documentation locally
1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) and other Ruby dependencies with `bundle install`. 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
**Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems. - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
2. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
4. Open `http://localhost:9001` in your browser, and voilà. 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
4. Open <http://localhost:9001> in your browser, and voilà.
Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).
@ -94,49 +88,50 @@ Documentation for v2.3.2 has been made available for the time being at <http://g
[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download. [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
## Contributing ## Contributing
Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo). Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
**Bootstrap v3 is now closed off to new features.** It has gone into maintenance mode so that we can focus our efforts on [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev), the future of the framework. Pull requests which add new features (rather than fix bugs) should target [Bootstrap v4 (the `v4-dev` git branch)](https://github.com/twbs/bootstrap/tree/v4-dev) instead.
Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>. Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
## Community ## Community
Get updates on Bootstrap's development and chat with the project maintainers and community members. Get updates on Bootstrap's development and chat with the project maintainers and community members.
* Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
* Join [the official Slack room](https://bootstrap-slack.herokuapp.com). - Join [the official Slack room](https://bootstrap-slack.herokuapp.com).
* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
* Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
* Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
## Versioning ## Versioning
For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible. For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
## Creators ## Creators
**Mark Otto** **Mark Otto**
* <https://twitter.com/mdo> - <https://twitter.com/mdo>
* <https://github.com/mdo> - <https://github.com/mdo>
**Jacob Thornton** **Jacob Thornton**
* <https://twitter.com/fat> - <https://twitter.com/fat>
* <https://github.com/fat> - <https://github.com/fat>
## Copyright and license ## Copyright and license
Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). Code and documentation copyright 2011-2015 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).

View file

@ -29,6 +29,6 @@
"test-infra" "test-infra"
], ],
"dependencies": { "dependencies": {
"jquery": "1.9.1 - 3" "jquery": ">= 1.9.1"
} }
} }

View file

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
.btn-default, .btn-default,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
@ -279,10 +279,10 @@ th {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.glyphicon-asterisk:before { .glyphicon-asterisk:before {
content: "\002a"; content: "\2a";
} }
.glyphicon-plus:before { .glyphicon-plus:before {
content: "\002b"; content: "\2b";
} }
.glyphicon-euro:before, .glyphicon-euro:before,
.glyphicon-eur:before { .glyphicon-eur:before {
@ -1106,6 +1106,7 @@ a:focus {
text-decoration: underline; text-decoration: underline;
} }
a:focus { a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@ -2536,6 +2537,7 @@ select[size] {
input[type="file"]:focus, input[type="file"]:focus,
input[type="radio"]:focus, input[type="radio"]:focus,
input[type="checkbox"]:focus { input[type="checkbox"]:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@ -2580,10 +2582,6 @@ output {
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: #999; color: #999;
} }
.form-control::-ms-expand {
background-color: transparent;
border: 0;
}
.form-control[disabled], .form-control[disabled],
.form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
@ -2990,7 +2988,7 @@ select[multiple].input-lg {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 11px; padding-top: 14.333333px;
font-size: 18px; font-size: 18px;
} }
} }
@ -3027,6 +3025,7 @@ select[multiple].input-lg {
.btn.focus, .btn.focus,
.btn:active.focus, .btn:active.focus,
.btn.active.focus { .btn.active.focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@ -3097,6 +3096,9 @@ fieldset[disabled] a.btn {
.open > .dropdown-toggle.btn-default { .open > .dropdown-toggle.btn-default {
background-image: none; background-image: none;
} }
.btn-default.disabled,
.btn-default[disabled],
fieldset[disabled] .btn-default,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default[disabled]:hover, .btn-default[disabled]:hover,
fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:hover,
@ -3105,7 +3107,13 @@ fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:focus,
.btn-default.disabled.focus, .btn-default.disabled.focus,
.btn-default[disabled].focus, .btn-default[disabled].focus,
fieldset[disabled] .btn-default.focus { fieldset[disabled] .btn-default.focus,
.btn-default.disabled:active,
.btn-default[disabled]:active,
fieldset[disabled] .btn-default:active,
.btn-default.disabled.active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default.active {
background-color: #fff; background-color: #fff;
border-color: #ccc; border-color: #ccc;
} }
@ -3154,6 +3162,9 @@ fieldset[disabled] .btn-default.focus {
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
background-image: none; background-image: none;
} }
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover, .btn-primary.disabled:hover,
.btn-primary[disabled]:hover, .btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:hover,
@ -3162,7 +3173,13 @@ fieldset[disabled] .btn-primary:hover,
fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus, .btn-primary.disabled.focus,
.btn-primary[disabled].focus, .btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus { fieldset[disabled] .btn-primary.focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #337ab7; background-color: #337ab7;
border-color: #2e6da4; border-color: #2e6da4;
} }
@ -3211,6 +3228,9 @@ fieldset[disabled] .btn-primary.focus {
.open > .dropdown-toggle.btn-success { .open > .dropdown-toggle.btn-success {
background-image: none; background-image: none;
} }
.btn-success.disabled,
.btn-success[disabled],
fieldset[disabled] .btn-success,
.btn-success.disabled:hover, .btn-success.disabled:hover,
.btn-success[disabled]:hover, .btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:hover,
@ -3219,7 +3239,13 @@ fieldset[disabled] .btn-success:hover,
fieldset[disabled] .btn-success:focus, fieldset[disabled] .btn-success:focus,
.btn-success.disabled.focus, .btn-success.disabled.focus,
.btn-success[disabled].focus, .btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus { fieldset[disabled] .btn-success.focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #4cae4c; border-color: #4cae4c;
} }
@ -3268,6 +3294,9 @@ fieldset[disabled] .btn-success.focus {
.open > .dropdown-toggle.btn-info { .open > .dropdown-toggle.btn-info {
background-image: none; background-image: none;
} }
.btn-info.disabled,
.btn-info[disabled],
fieldset[disabled] .btn-info,
.btn-info.disabled:hover, .btn-info.disabled:hover,
.btn-info[disabled]:hover, .btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:hover,
@ -3276,7 +3305,13 @@ fieldset[disabled] .btn-info:hover,
fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus, .btn-info.disabled.focus,
.btn-info[disabled].focus, .btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus { fieldset[disabled] .btn-info.focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #46b8da; border-color: #46b8da;
} }
@ -3325,6 +3360,9 @@ fieldset[disabled] .btn-info.focus {
.open > .dropdown-toggle.btn-warning { .open > .dropdown-toggle.btn-warning {
background-image: none; background-image: none;
} }
.btn-warning.disabled,
.btn-warning[disabled],
fieldset[disabled] .btn-warning,
.btn-warning.disabled:hover, .btn-warning.disabled:hover,
.btn-warning[disabled]:hover, .btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:hover,
@ -3333,7 +3371,13 @@ fieldset[disabled] .btn-warning:hover,
fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus, .btn-warning.disabled.focus,
.btn-warning[disabled].focus, .btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus { fieldset[disabled] .btn-warning.focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active,
.btn-warning.disabled.active,
.btn-warning[disabled].active,
fieldset[disabled] .btn-warning.active {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #eea236; border-color: #eea236;
} }
@ -3382,6 +3426,9 @@ fieldset[disabled] .btn-warning.focus {
.open > .dropdown-toggle.btn-danger { .open > .dropdown-toggle.btn-danger {
background-image: none; background-image: none;
} }
.btn-danger.disabled,
.btn-danger[disabled],
fieldset[disabled] .btn-danger,
.btn-danger.disabled:hover, .btn-danger.disabled:hover,
.btn-danger[disabled]:hover, .btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover, fieldset[disabled] .btn-danger:hover,
@ -3390,7 +3437,13 @@ fieldset[disabled] .btn-danger:hover,
fieldset[disabled] .btn-danger:focus, fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled.focus, .btn-danger.disabled.focus,
.btn-danger[disabled].focus, .btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus { fieldset[disabled] .btn-danger.focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active,
.btn-danger.disabled.active,
.btn-danger[disabled].active,
fieldset[disabled] .btn-danger.active {
background-color: #d9534f; background-color: #d9534f;
border-color: #d43f3a; border-color: #d43f3a;
} }
@ -3764,7 +3817,6 @@ tbody.collapse.in {
border-radius: 0; border-radius: 0;
} }
.btn-group-vertical > .btn:first-child:not(:last-child) { .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
@ -3772,7 +3824,6 @@ tbody.collapse.in {
.btn-group-vertical > .btn:last-child:not(:first-child) { .btn-group-vertical > .btn:last-child:not(:first-child) {
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
@ -3830,9 +3881,6 @@ tbody.collapse.in {
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
} }
.input-group .form-control:focus {
z-index: 3;
}
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
@ -4744,7 +4792,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
z-index: 2; z-index: 3;
color: #23527c; color: #23527c;
background-color: #eee; background-color: #eee;
border-color: #ddd; border-color: #ddd;
@ -4755,7 +4803,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:hover, .pagination > .active > span:hover,
.pagination > .active > a:focus, .pagination > .active > a:focus,
.pagination > .active > span:focus { .pagination > .active > span:focus {
z-index: 3; z-index: 2;
color: #fff; color: #fff;
cursor: default; cursor: default;
background-color: #337ab7; background-color: #337ab7;
@ -4976,8 +5024,6 @@ a.badge:focus {
} }
.container .jumbotron, .container .jumbotron,
.container-fluid .jumbotron { .container-fluid .jumbotron {
padding-right: 15px;
padding-left: 15px;
border-radius: 6px; border-radius: 6px;
} }
.jumbotron .container { .jumbotron .container {
@ -5932,6 +5978,7 @@ button.close {
opacity: .5; opacity: .5;
} }
.modal-header { .modal-header {
min-height: 16.42857143px;
padding: 15px; padding: 15px;
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
@ -6324,7 +6371,6 @@ button.close {
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, .6); text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
background-color: rgba(0, 0, 0, 0);
filter: alpha(opacity=50); filter: alpha(opacity=50);
opacity: .5; opacity: .5;
} }
@ -6438,16 +6484,16 @@ button.close {
.carousel-control .icon-next { .carousel-control .icon-next {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-top: -10px; margin-top: -15px;
font-size: 30px; font-size: 30px;
} }
.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-left,
.carousel-control .icon-prev { .carousel-control .icon-prev {
margin-left: -10px; margin-left: -15px;
} }
.carousel-control .glyphicon-chevron-right, .carousel-control .glyphicon-chevron-right,
.carousel-control .icon-next { .carousel-control .icon-next {
margin-right: -10px; margin-right: -15px;
} }
.carousel-caption { .carousel-caption {
right: 20%; right: 20%;
@ -6486,8 +6532,6 @@ button.close {
.pager:after, .pager:after,
.panel-body:before, .panel-body:before,
.panel-body:after, .panel-body:after,
.modal-header:before,
.modal-header:after,
.modal-footer:before, .modal-footer:before,
.modal-footer:after { .modal-footer:after {
display: table; display: table;
@ -6507,7 +6551,6 @@ button.close {
.navbar-collapse:after, .navbar-collapse:after,
.pager:after, .pager:after,
.panel-body:after, .panel-body:after,
.modal-header:after,
.modal-footer:after { .modal-footer:after {
clear: both; clear: both;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under the MIT license * Licensed under the MIT license
*/ */
@ -11,16 +11,16 @@ if (typeof jQuery === 'undefined') {
+function ($) { +function ($) {
'use strict'; 'use strict';
var version = $.fn.jquery.split(' ')[0].split('.') 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] > 3)) { if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4') throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
} }
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.7 * Bootstrap: transition.js v3.3.5
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -77,10 +77,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.7 * Bootstrap: alert.js v3.3.5
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.7' Alert.VERSION = '3.3.5'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
@ -109,7 +109,7 @@ if (typeof jQuery === 'undefined') {
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
} }
var $parent = $(selector === '#' ? [] : selector) var $parent = $(selector)
if (e) e.preventDefault() if (e) e.preventDefault()
@ -172,10 +172,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.7 * Bootstrap: button.js v3.3.5
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.7' Button.VERSION = '3.3.5'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
@ -214,10 +214,10 @@ if (typeof jQuery === 'undefined') {
if (state == 'loadingText') { if (state == 'loadingText') {
this.isLoading = true this.isLoading = true
$el.addClass(d).attr(d, d).prop(d, true) $el.addClass(d).attr(d, d)
} else if (this.isLoading) { } else if (this.isLoading) {
this.isLoading = false this.isLoading = false
$el.removeClass(d).removeAttr(d).prop(d, false) $el.removeClass(d).removeAttr(d)
} }
}, this), 0) }, this), 0)
} }
@ -281,15 +281,10 @@ if (typeof jQuery === 'undefined') {
$(document) $(document)
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
var $btn = $(e.target).closest('.btn') var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
Plugin.call($btn, 'toggle') Plugin.call($btn, 'toggle')
if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) { if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
// Prevent double click on radios, and the double selections (so cancellation) on checkboxes
e.preventDefault()
// The target component still receive the focus
if ($btn.is('input,button')) $btn.trigger('focus')
else $btn.find('input:visible,button:visible').first().trigger('focus')
}
}) })
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
@ -298,10 +293,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.7 * Bootstrap: carousel.js v3.3.5
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -329,7 +324,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.7' Carousel.VERSION = '3.3.5'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600
@ -536,14 +531,13 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.7 * Bootstrap: collapse.js v3.3.5
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
/* jshint latedef: false */
+function ($) { +function ($) {
'use strict'; 'use strict';
@ -567,7 +561,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.7' Collapse.VERSION = '3.3.5'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350
@ -749,10 +743,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.7 * Bootstrap: dropdown.js v3.3.5
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -769,7 +763,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.7' Dropdown.VERSION = '3.3.5'
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
@ -801,7 +795,7 @@ if (typeof jQuery === 'undefined') {
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
$this.attr('aria-expanded', 'false') $this.attr('aria-expanded', 'false')
$parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
}) })
} }
@ -835,7 +829,7 @@ if (typeof jQuery === 'undefined') {
$parent $parent
.toggleClass('open') .toggleClass('open')
.trigger($.Event('shown.bs.dropdown', relatedTarget)) .trigger('shown.bs.dropdown', relatedTarget)
} }
return false return false
@ -915,10 +909,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.7 * Bootstrap: modal.js v3.3.5
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -949,7 +943,7 @@ if (typeof jQuery === 'undefined') {
} }
} }
Modal.VERSION = '3.3.7' Modal.VERSION = '3.3.5'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
@ -1056,9 +1050,7 @@ if (typeof jQuery === 'undefined') {
$(document) $(document)
.off('focusin.bs.modal') // guard against infinite focus loop .off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) { .on('focusin.bs.modal', $.proxy(function (e) {
if (document !== e.target && if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
this.$element[0] !== e.target &&
!this.$element.has(e.target).length) {
this.$element.trigger('focus') this.$element.trigger('focus')
} }
}, this)) }, this))
@ -1255,11 +1247,11 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.7 * Bootstrap: tooltip.js v3.3.5
* http://getbootstrap.com/javascript/#tooltip * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -1282,7 +1274,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.7' Tooltip.VERSION = '3.3.5'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
@ -1573,11 +1565,9 @@ if (typeof jQuery === 'undefined') {
function complete() { function complete() {
if (that.hoverState != 'in') $tip.detach() if (that.hoverState != 'in') $tip.detach()
if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary. that.$element
that.$element .removeAttr('aria-describedby')
.removeAttr('aria-describedby') .trigger('hidden.bs.' + that.type)
.trigger('hidden.bs.' + that.type)
}
callback && callback() callback && callback()
} }
@ -1620,10 +1610,7 @@ if (typeof jQuery === 'undefined') {
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
} }
var isSvg = window.SVGElement && el instanceof window.SVGElement var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
// Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
// See https://github.com/twbs/bootstrap/issues/20280
var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
@ -1739,7 +1726,6 @@ if (typeof jQuery === 'undefined') {
that.$tip = null that.$tip = null
that.$arrow = null that.$arrow = null
that.$viewport = null that.$viewport = null
that.$element = null
}) })
} }
@ -1776,10 +1762,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.7 * Bootstrap: popover.js v3.3.5
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -1796,7 +1782,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.7' Popover.VERSION = '3.3.5'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',
@ -1885,10 +1871,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.7 * Bootstrap: scrollspy.js v3.3.5
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -1914,7 +1900,7 @@ if (typeof jQuery === 'undefined') {
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.7' ScrollSpy.VERSION = '3.3.5'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10
@ -2058,10 +2044,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.7 * Bootstrap: tab.js v3.3.5
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -2078,7 +2064,7 @@ if (typeof jQuery === 'undefined') {
// jscs:enable requireDollarBeforejQueryAssignment // jscs:enable requireDollarBeforejQueryAssignment
} }
Tab.VERSION = '3.3.7' Tab.VERSION = '3.3.5'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150
@ -2214,10 +2200,10 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.7 * Bootstrap: affix.js v3.3.5
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -2243,7 +2229,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.7' Affix.VERSION = '3.3.5'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'

File diff suppressed because one or more lines are too long

View file

@ -13,7 +13,7 @@
"docsJs": [ "docsJs": [
"../assets/js/vendor/holder.min.js", "../assets/js/vendor/holder.min.js",
"../assets/js/vendor/ZeroClipboard.min.js", "../assets/js/vendor/ZeroClipboard.min.js",
"../assets/js/vendor/anchor.min.js", "../assets/js/vendor/anchor.js",
"../assets/js/src/application.js" "../assets/js/src/application.js"
] ]
}, },
@ -37,10 +37,10 @@
"+function ($) {", "+function ($) {",
" 'use strict';", " 'use strict';",
" var version = $.fn.jquery.split(' ')[0].split('.')", " 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] > 3)) {", " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {",
" throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4')", " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')",
" }", " }",
"}(jQuery);\n\n" "}(jQuery);\n\n"
] ]
} }
} }

View file

@ -57,7 +57,7 @@
{ {
browserName: "iphone", browserName: "iphone",
platform: "OS X 10.10", platform: "OS X 10.10",
version: "9.2" version: "8.2"
}, },
# iOS Chrome not currently supported by Sauce Labs # iOS Chrome not currently supported by Sauce Labs

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.7 * Bootstrap: affix.js v3.3.5
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -28,7 +28,7 @@
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.7' Affix.VERSION = '3.3.5'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.7 * Bootstrap: alert.js v3.3.5
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.7' Alert.VERSION = '3.3.5'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
@ -31,7 +31,7 @@
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
} }
var $parent = $(selector === '#' ? [] : selector) var $parent = $(selector)
if (e) e.preventDefault() if (e) e.preventDefault()

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.7 * Bootstrap: button.js v3.3.5
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -19,7 +19,7 @@
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.7' Button.VERSION = '3.3.5'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
@ -41,10 +41,10 @@
if (state == 'loadingText') { if (state == 'loadingText') {
this.isLoading = true this.isLoading = true
$el.addClass(d).attr(d, d).prop(d, true) $el.addClass(d).attr(d, d)
} else if (this.isLoading) { } else if (this.isLoading) {
this.isLoading = false this.isLoading = false
$el.removeClass(d).removeAttr(d).prop(d, false) $el.removeClass(d).removeAttr(d)
} }
}, this), 0) }, this), 0)
} }
@ -108,15 +108,10 @@
$(document) $(document)
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
var $btn = $(e.target).closest('.btn') var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
Plugin.call($btn, 'toggle') Plugin.call($btn, 'toggle')
if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) { if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
// Prevent double click on radios, and the double selections (so cancellation) on checkboxes
e.preventDefault()
// The target component still receive the focus
if ($btn.is('input,button')) $btn.trigger('focus')
else $btn.find('input:visible,button:visible').first().trigger('focus')
}
}) })
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.7 * Bootstrap: carousel.js v3.3.5
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.7' Carousel.VERSION = '3.3.5'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600

View file

@ -1,12 +1,11 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.7 * Bootstrap: collapse.js v3.3.5
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
/* jshint latedef: false */
+function ($) { +function ($) {
'use strict'; 'use strict';
@ -30,7 +29,7 @@
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.7' Collapse.VERSION = '3.3.5'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.7 * Bootstrap: dropdown.js v3.3.5
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.7' Dropdown.VERSION = '3.3.5'
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
@ -51,7 +51,7 @@
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
$this.attr('aria-expanded', 'false') $this.attr('aria-expanded', 'false')
$parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
}) })
} }
@ -85,7 +85,7 @@
$parent $parent
.toggleClass('open') .toggleClass('open')
.trigger($.Event('shown.bs.dropdown', relatedTarget)) .trigger('shown.bs.dropdown', relatedTarget)
} }
return false return false

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.7 * Bootstrap: modal.js v3.3.5
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -33,7 +33,7 @@
} }
} }
Modal.VERSION = '3.3.7' Modal.VERSION = '3.3.5'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
@ -140,9 +140,7 @@
$(document) $(document)
.off('focusin.bs.modal') // guard against infinite focus loop .off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) { .on('focusin.bs.modal', $.proxy(function (e) {
if (document !== e.target && if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
this.$element[0] !== e.target &&
!this.$element.has(e.target).length) {
this.$element.trigger('focus') this.$element.trigger('focus')
} }
}, this)) }, this))

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.7 * Bootstrap: popover.js v3.3.5
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -19,7 +19,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.7' Popover.VERSION = '3.3.5'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.7 * Bootstrap: scrollspy.js v3.3.5
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -28,7 +28,7 @@
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.7' ScrollSpy.VERSION = '3.3.5'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.7 * Bootstrap: tab.js v3.3.5
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -19,7 +19,7 @@
// jscs:enable requireDollarBeforejQueryAssignment // jscs:enable requireDollarBeforejQueryAssignment
} }
Tab.VERSION = '3.3.7' Tab.VERSION = '3.3.5'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150

View file

@ -1,9 +1,9 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.7 * Bootstrap: tooltip.js v3.3.5
* http://getbootstrap.com/javascript/#tooltip * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */
@ -26,7 +26,7 @@
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.7' Tooltip.VERSION = '3.3.5'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
@ -317,11 +317,9 @@
function complete() { function complete() {
if (that.hoverState != 'in') $tip.detach() if (that.hoverState != 'in') $tip.detach()
if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary. that.$element
that.$element .removeAttr('aria-describedby')
.removeAttr('aria-describedby') .trigger('hidden.bs.' + that.type)
.trigger('hidden.bs.' + that.type)
}
callback && callback() callback && callback()
} }
@ -364,10 +362,7 @@
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
} }
var isSvg = window.SVGElement && el instanceof window.SVGElement var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
// Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
// See https://github.com/twbs/bootstrap/issues/20280
var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
@ -483,7 +478,6 @@
that.$tip = null that.$tip = null
that.$arrow = null that.$arrow = null
that.$viewport = null that.$viewport = null
that.$element = null
}) })
} }

View file

@ -1,8 +1,8 @@
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.7 * Bootstrap: transition.js v3.3.5
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */ * ======================================================================== */

View file

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */

View file

@ -59,7 +59,7 @@
.border-right-radius(0); .border-right-radius(0);
} }
} }
// Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child:not(:first-child), .btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child) { .btn-group > .dropdown-toggle:not(:first-child) {
.border-left-radius(0); .border-left-radius(0);
@ -173,12 +173,12 @@
border-radius: 0; border-radius: 0;
} }
&:first-child:not(:last-child) { &:first-child:not(:last-child) {
.border-top-radius(@btn-border-radius-base); border-top-right-radius: @btn-border-radius-base;
.border-bottom-radius(0); .border-bottom-radius(0);
} }
&:last-child:not(:first-child) { &:last-child:not(:first-child) {
border-bottom-left-radius: @btn-border-radius-base;
.border-top-radius(0); .border-top-radius(0);
.border-bottom-radius(@btn-border-radius-base);
} }
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {

View file

@ -101,7 +101,6 @@
color: @carousel-control-color; color: @carousel-control-color;
text-align: center; text-align: center;
text-shadow: @carousel-text-shadow; text-shadow: @carousel-text-shadow;
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
// We can't have this transition here because WebKit cancels the carousel // We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation. // animation if you trip this while in the middle of another animation.
@ -241,18 +240,18 @@
.glyphicon-chevron-right, .glyphicon-chevron-right,
.icon-prev, .icon-prev,
.icon-next { .icon-next {
width: (@carousel-control-font-size * 1.5); width: 30px;
height: (@carousel-control-font-size * 1.5); height: 30px;
margin-top: (@carousel-control-font-size / -2); margin-top: -15px;
font-size: (@carousel-control-font-size * 1.5); font-size: 30px;
} }
.glyphicon-chevron-left, .glyphicon-chevron-left,
.icon-prev { .icon-prev {
margin-left: (@carousel-control-font-size / -2); margin-left: -15px;
} }
.glyphicon-chevron-right, .glyphicon-chevron-right,
.icon-next { .icon-next {
margin-right: (@carousel-control-font-size / -2); margin-right: -15px;
} }
} }

View file

@ -132,12 +132,6 @@ output {
// Placeholder // Placeholder
.placeholder(); .placeholder();
// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
border: 0;
background-color: transparent;
}
// Disabled and read-only inputs // Disabled and read-only inputs
// //
// HTML5 says that controls under a fieldset > legend:first-child won't be // HTML5 says that controls under a fieldset > legend:first-child won't be
@ -181,7 +175,7 @@ input[type="search"] {
// set a pixel line-height that matches the given height of the input, but only // set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848 // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
// //
// Note that as of 9.3, iOS doesn't support `week`. // Note that as of 8.3, iOS doesn't support `datetime` or `week`.
@media screen and (-webkit-min-device-pixel-ratio: 0) { @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"], input[type="date"],
@ -439,10 +433,10 @@ input[type="checkbox"] {
.has-feedback label { .has-feedback label {
& ~ .form-control-feedback { & ~ .form-control-feedback {
top: (@line-height-computed + 5); // Height of the `label` and its margin top: (@line-height-computed + 5); // Height of the `label` and its margin
} }
&.sr-only ~ .form-control-feedback { &.sr-only ~ .form-control-feedback {
top: 0; top: 0;
} }
} }
@ -597,7 +591,7 @@ input[type="checkbox"] {
.form-group-lg { .form-group-lg {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: (@padding-large-vertical + 1); padding-top: ((@padding-large-vertical * @line-height-large) + 1);
font-size: @font-size-large; font-size: @font-size-large;
} }
} }

View file

@ -32,8 +32,8 @@
} }
// Individual icons // Individual icons
.glyphicon-asterisk { &:before { content: "\002a"; } } .glyphicon-asterisk { &:before { content: "\2a"; } }
.glyphicon-plus { &:before { content: "\002b"; } } .glyphicon-plus { &:before { content: "\2b"; } }
.glyphicon-euro, .glyphicon-euro,
.glyphicon-eur { &:before { content: "\20ac"; } } .glyphicon-eur { &:before { content: "\20ac"; } }
.glyphicon-minus { &:before { content: "\2212"; } } .glyphicon-minus { &:before { content: "\2212"; } }

View file

@ -29,10 +29,6 @@
width: 100%; width: 100%;
margin-bottom: 0; margin-bottom: 0;
&:focus {
z-index: 3;
}
} }
} }
@ -83,18 +79,18 @@
text-align: center; text-align: center;
background-color: @input-group-addon-bg; background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color; border: 1px solid @input-group-addon-border-color;
border-radius: @input-border-radius; border-radius: @border-radius-base;
// Sizing // Sizing
&.input-sm { &.input-sm {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
border-radius: @input-border-radius-small; border-radius: @border-radius-small;
} }
&.input-lg { &.input-lg {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
border-radius: @input-border-radius-large; border-radius: @border-radius-large;
} }
// Nuke default margins from checkboxes and radios to vertically center within. // Nuke default margins from checkboxes and radios to vertically center within.

View file

@ -28,8 +28,6 @@
.container &, .container &,
.container-fluid & { .container-fluid & {
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
padding-left: (@grid-gutter-width / 2);
padding-right: (@grid-gutter-width / 2);
} }
.container { .container {

View file

@ -42,9 +42,12 @@
&.disabled, &.disabled,
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
&,
&:hover, &:hover,
&:focus, &:focus,
&.focus { &.focus,
&:active,
&.active {
background-color: @background; background-color: @background;
border-color: @border; border-color: @border;
} }

View file

@ -6,8 +6,8 @@
.container-fixed(@gutter: @grid-gutter-width) { .container-fixed(@gutter: @grid-gutter-width) {
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-left: floor((@gutter / 2)); padding-left: (@gutter / 2);
padding-right: ceil((@gutter / 2)); padding-right: (@gutter / 2);
&:extend(.clearfix all); &:extend(.clearfix all);
} }

View file

@ -6,7 +6,7 @@
// //
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
// Deprecated as of v3.0.1 (has been removed in v4) // Deprecated as of v3.0.1 (will be removed in v4)
.hide-text() { .hide-text() {
font: ~"0/0" a; font: ~"0/0" a;
color: transparent; color: transparent;

View file

@ -1,9 +1,9 @@
// WebKit-style focus // WebKit-style focus
.tab-focus() { .tab-focus() {
// WebKit-specific. Other browsers will keep their default outline style. // Default
// (Initially tried to also force default via `outline: initial`, outline: thin dotted;
// but that seems to erroneously remove the outline in Firefox altogether.) // WebKit
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }

View file

@ -1,7 +1,7 @@
// Vendor Prefixes // Vendor Prefixes
// //
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
// Autoprefixer in our Gruntfile. They have been removed in v4. // Autoprefixer in our Gruntfile. They will be removed in v4.
// - Animations // - Animations
// - Backface visibility // - Backface visibility
@ -54,7 +54,7 @@
// Prevent browsers from flickering when using CSS 3D transforms. // Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden` // Default value is `visible`, but can be changed to `hidden`
.backface-visibility(@visibility) { .backface-visibility(@visibility){
-webkit-backface-visibility: @visibility; -webkit-backface-visibility: @visibility;
-moz-backface-visibility: @visibility; -moz-backface-visibility: @visibility;
backface-visibility: @visibility; backface-visibility: @visibility;

View file

@ -79,7 +79,7 @@
.modal-header { .modal-header {
padding: @modal-title-padding; padding: @modal-title-padding;
border-bottom: 1px solid @modal-header-border-color; border-bottom: 1px solid @modal-header-border-color;
&:extend(.clearfix all); min-height: (@modal-title-padding + @modal-title-line-height);
} }
// Close icon // Close icon
.modal-header .close { .modal-header .close {

View file

@ -40,7 +40,7 @@
> li > span { > li > span {
&:hover, &:hover,
&:focus { &:focus {
z-index: 2; z-index: 3;
color: @pagination-hover-color; color: @pagination-hover-color;
background-color: @pagination-hover-bg; background-color: @pagination-hover-bg;
border-color: @pagination-hover-border; border-color: @pagination-hover-border;
@ -52,7 +52,7 @@
&, &,
&:hover, &:hover,
&:focus { &:focus {
z-index: 3; z-index: 2;
color: @pagination-active-color; color: @pagination-active-color;
background-color: @pagination-active-bg; background-color: @pagination-active-bg;
border-color: @pagination-active-border; border-color: @pagination-active-border;

View file

@ -214,7 +214,7 @@
} }
// Collapsible panels (aka, accordion) // Collapsable panels (aka, accordion)
// //
// Wrap a series of panels in `.panel-group` to turn them into an accordion with // Wrap a series of panels in `.panel-group` to turn them into an accordion with
// the help of our collapse JavaScript plugin. // the help of our collapse JavaScript plugin.

View file

@ -120,7 +120,7 @@ hr {
// Only display content to screen readers // Only display content to screen readers
// //
// See: http://a11yproject.com/posts/how-to-hide-content // See: http://a11yproject.com/posts/how-to-hide-content/
.sr-only { .sr-only {
position: absolute; position: absolute;

View file

@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */

View file

@ -211,7 +211,7 @@ dd {
&:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
} }
@media (min-width: @dl-horizontal-breakpoint) { @media (min-width: @grid-float-breakpoint) {
dt { dt {
float: left; float: left;
width: (@dl-horizontal-offset - 20); width: (@dl-horizontal-offset - 20);

View file

@ -111,7 +111,7 @@
//** Global background color for active items (e.g., navs or dropdowns). //** Global background color for active items (e.g., navs or dropdowns).
@component-active-bg: @brand-primary; @component-active-bg: @brand-primary;
//** Width of the `border` for generating carets that indicate dropdowns. //** Width of the `border` for generating carets that indicator dropdowns.
@caret-width-base: 4px; @caret-width-base: 4px;
//** Carets increase slightly in size for larger components. //** Carets increase slightly in size for larger components.
@caret-width-large: 5px; @caret-width-large: 5px;
@ -863,7 +863,5 @@
@page-header-border-color: @gray-lighter; @page-header-border-color: @gray-lighter;
//** Width of horizontal description list titles //** Width of horizontal description list titles
@dl-horizontal-offset: @component-offset-horizontal; @dl-horizontal-offset: @component-offset-horizontal;
//** Point at which .dl-horizontal becomes horizontal
@dl-horizontal-breakpoint: @grid-float-breakpoint;
//** Horizontal line color. //** Horizontal line color.
@hr-border: @gray-lighter; @hr-border: @gray-lighter;

View file

@ -6,26 +6,19 @@
Package.describe({ Package.describe({
name: 'twbs:bootstrap', // http://atmospherejs.com/twbs/bootstrap name: 'twbs:bootstrap', // http://atmospherejs.com/twbs/bootstrap
summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.', summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.',
version: '3.3.7', version: '3.3.5',
git: 'https://github.com/twbs/bootstrap.git' git: 'https://github.com/twbs/bootstrap.git'
}); });
Package.onUse(function (api) { Package.onUse(function (api) {
api.versionsFrom('METEOR@1.0'); api.versionsFrom('METEOR@1.0');
api.use('jquery', 'client'); api.use('jquery', 'client');
var assets = [ api.addFiles([
'dist/fonts/glyphicons-halflings-regular.eot', 'dist/fonts/glyphicons-halflings-regular.eot',
'dist/fonts/glyphicons-halflings-regular.svg', 'dist/fonts/glyphicons-halflings-regular.svg',
'dist/fonts/glyphicons-halflings-regular.ttf', 'dist/fonts/glyphicons-halflings-regular.ttf',
'dist/fonts/glyphicons-halflings-regular.woff', 'dist/fonts/glyphicons-halflings-regular.woff',
'dist/fonts/glyphicons-halflings-regular.woff2' 'dist/fonts/glyphicons-halflings-regular.woff2',
];
if (api.addAssets) {
api.addAssets(assets, 'client');
} else {
api.addFiles(assets, 'client', { isAsset: true });
}
api.addFiles([
'dist/css/bootstrap.css', 'dist/css/bootstrap.css',
'dist/js/bootstrap.js' 'dist/js/bootstrap.js'
], 'client'); ], 'client');

View file

@ -1,7 +1,7 @@
{ {
"name": "bootstrap", "name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.3.7", "version": "3.3.5",
"keywords": [ "keywords": [
"css", "css",
"less", "less",
@ -14,8 +14,6 @@
"homepage": "http://getbootstrap.com", "homepage": "http://getbootstrap.com",
"author": "Twitter, Inc.", "author": "Twitter, Inc.",
"scripts": { "scripts": {
"change-version": "node grunt/change-version.js",
"update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
"test": "grunt test" "test": "grunt test"
}, },
"style": "dist/css/bootstrap.css", "style": "dist/css/bootstrap.css",
@ -31,34 +29,34 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~7.0.3", "glob": "~5.0.5",
"grunt": "~1.0.1", "grunt": "~0.4.5",
"grunt-autoprefixer": "~3.0.4", "grunt-autoprefixer": "~3.0.0",
"grunt-contrib-clean": "~1.0.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~1.3.0", "grunt-contrib-compress": "~0.13.0",
"grunt-contrib-concat": "~1.0.0", "grunt-contrib-concat": "~0.5.1",
"grunt-contrib-connect": "~1.0.0", "grunt-contrib-connect": "~0.10.1",
"grunt-contrib-copy": "~1.0.0", "grunt-contrib-copy": "~0.8.0",
"grunt-contrib-csslint": "~1.0.0", "grunt-contrib-csslint": "~0.4.0",
"grunt-contrib-cssmin": "~1.0.0", "grunt-contrib-cssmin": "~0.12.3",
"grunt-contrib-htmlmin": "~1.5.0", "grunt-contrib-htmlmin": "~0.4.0",
"grunt-contrib-jshint": "~1.0.0", "grunt-contrib-jade": "~0.14.1",
"grunt-contrib-less": "~1.3.0", "grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-pug": "~1.0.0", "grunt-contrib-less": "~1.0.1",
"grunt-contrib-qunit": "~0.7.0", "grunt-contrib-qunit": "~0.7.0",
"grunt-contrib-uglify": "~1.0.0", "grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~1.0.0", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.1.0", "grunt-csscomb": "~3.0.0",
"grunt-exec": "~1.0.0", "grunt-exec": "~0.4.6",
"grunt-html": "~8.0.1", "grunt-html": "~4.0.3",
"grunt-jekyll": "~0.4.4", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~3.0.1", "grunt-jscs": "~1.8.0",
"grunt-saucelabs": "~9.0.0", "grunt-saucelabs": "~8.6.1",
"load-grunt-tasks": "~3.5.0", "grunt-sed": "twbs/grunt-sed#v0.2.0",
"markdown-it": "^7.0.0", "load-grunt-tasks": "~3.2.0",
"shelljs": "^0.7.0", "markdown-it": "^4.2.1",
"shx": "^0.1.2", "npm-shrinkwrap": "^200.4.0",
"time-grunt": "^1.3.0" "time-grunt": "^1.2.0"
}, },
"engines": { "engines": {
"node": ">=0.10.1" "node": ">=0.10.1"

View file

@ -1,5 +1,5 @@
/** /**
* matchesSelector v2.0.2 * matchesSelector v2.0.1
* matchesSelector( element, '.selector' ) * matchesSelector( element, '.selector' )
* MIT license * MIT license
*/ */
@ -25,7 +25,7 @@
'use strict'; 'use strict';
var matchesMethod = ( function() { var matchesMethod = ( function() {
var ElemProto = window.Element.prototype; var ElemProto = Element.prototype;
// check for the standard method name first // check for the standard method name first
if ( ElemProto.matches ) { if ( ElemProto.matches ) {
return 'matches'; return 'matches';

View file

@ -17,7 +17,7 @@ MyClass.prototype = Object.create( EvEmitter.prototype );
_.extend( MyClass.prototype, EvEmitter.prototype ); _.extend( MyClass.prototype, EvEmitter.prototype );
// single instance // single instance
var emitter = new EvEmitter(); var emitter = new EventEmitter();
``` ```
### on ### on
@ -58,14 +58,6 @@ emitter.emitEvent( eventName, args )
+ `eventName` - _String_ - name of the event + `eventName` - _String_ - name of the event
+ `args` - _Array_ - arguments passed to listeners + `args` - _Array_ - arguments passed to listeners
### allOff
Removes all event listeners.
``` js
emitter.allOff()
```
## Code example ## Code example
``` js ``` js

View file

@ -23,7 +23,6 @@
"bower_components", "bower_components",
"test", "test",
"tests", "tests",
"sandbox", "sandbox"
"package.json"
] ]
} }

View file

@ -1,5 +1,5 @@
/** /**
* EvEmitter v1.1.0 * EvEmitter v1.0.3
* Lil' event emitter * Lil' event emitter
* MIT License * MIT License
*/ */
@ -79,14 +79,13 @@ proto.emitEvent = function( eventName, args ) {
if ( !listeners || !listeners.length ) { if ( !listeners || !listeners.length ) {
return; return;
} }
// copy over to avoid interference if .off() in listener var i = 0;
listeners = listeners.slice(0); var listener = listeners[i];
args = args || []; args = args || [];
// once stuff // once stuff
var onceListeners = this._onceEvents && this._onceEvents[ eventName ]; var onceListeners = this._onceEvents && this._onceEvents[ eventName ];
for ( var i=0; i < listeners.length; i++ ) { while ( listener ) {
var listener = listeners[i]
var isOnce = onceListeners && onceListeners[ listener ]; var isOnce = onceListeners && onceListeners[ listener ];
if ( isOnce ) { if ( isOnce ) {
// remove listener // remove listener
@ -97,16 +96,14 @@ proto.emitEvent = function( eventName, args ) {
} }
// trigger listener // trigger listener
listener.apply( this, args ); listener.apply( this, args );
// get next listener
i += isOnce ? 0 : 1;
listener = listeners[i];
} }
return this; return this;
}; };
proto.allOff = function() {
delete this._events;
delete this._onceEvents;
};
return EvEmitter; return EvEmitter;
})); }));

View file

@ -6,7 +6,7 @@
"description": "UI utilities", "description": "UI utilities",
"main": "utils.js", "main": "utils.js",
"dependencies": { "dependencies": {
"desandro-matches-selector": "^2.0.0" "desandro-matches-selector": "~2.0.0"
}, },
"moduleType": [ "moduleType": [
"amd", "amd",

View file

@ -1,5 +1,5 @@
/** /**
* Fizzy UI utils v2.0.7 * Fizzy UI utils v2.0.3
* MIT license * MIT license
*/ */
@ -54,27 +54,22 @@ utils.modulo = function( num, div ) {
// ----- makeArray ----- // // ----- makeArray ----- //
var arraySlice = Array.prototype.slice;
// turn element or nodeList into an array // turn element or nodeList into an array
utils.makeArray = function( obj ) { utils.makeArray = function( obj ) {
var ary = [];
if ( Array.isArray( obj ) ) { if ( Array.isArray( obj ) ) {
// use object if already an array // use object if already an array
return obj; ary = obj;
} } else if ( obj && typeof obj.length == 'number' ) {
// return empty array if undefined or null. #6
if ( obj === null || obj === undefined ) {
return [];
}
var isArrayLike = typeof obj == 'object' && typeof obj.length == 'number';
if ( isArrayLike ) {
// convert nodeList to array // convert nodeList to array
return arraySlice.call( obj ); for ( var i=0; i < obj.length; i++ ) {
ary.push( obj[i] );
}
} else {
// array of single index
ary.push( obj );
} }
return ary;
// array of single index
return [ obj ];
}; };
// ----- removeFrom ----- // // ----- removeFrom ----- //
@ -89,7 +84,7 @@ utils.removeFrom = function( ary, obj ) {
// ----- getParent ----- // // ----- getParent ----- //
utils.getParent = function( elem, selector ) { utils.getParent = function( elem, selector ) {
while ( elem.parentNode && elem != document.body ) { while ( elem != document.body ) {
elem = elem.parentNode; elem = elem.parentNode;
if ( matchesSelector( elem, selector ) ) { if ( matchesSelector( elem, selector ) ) {
return elem; return elem;
@ -153,21 +148,22 @@ utils.filterFindElements = function( elems, selector ) {
// ----- debounceMethod ----- // // ----- debounceMethod ----- //
utils.debounceMethod = function( _class, methodName, threshold ) { utils.debounceMethod = function( _class, methodName, threshold ) {
threshold = threshold || 100;
// original method // original method
var method = _class.prototype[ methodName ]; var method = _class.prototype[ methodName ];
var timeoutName = methodName + 'Timeout'; var timeoutName = methodName + 'Timeout';
_class.prototype[ methodName ] = function() { _class.prototype[ methodName ] = function() {
var timeout = this[ timeoutName ]; var timeout = this[ timeoutName ];
clearTimeout( timeout ); if ( timeout ) {
clearTimeout( timeout );
}
var args = arguments; var args = arguments;
var _this = this; var _this = this;
this[ timeoutName ] = setTimeout( function() { this[ timeoutName ] = setTimeout( function() {
method.apply( _this, args ); method.apply( _this, args );
delete _this[ timeoutName ]; delete _this[ timeoutName ];
}, threshold ); }, threshold || 100 );
}; };
}; };

View file

@ -1,32 +1,24 @@
# getSize # getSize
Get the size of elements. Used in [Masonry](https://masonry.desandro.com), [Isotope](https://isotope.metafizzy.co), & [Flickity](https://flickity.metafizzy.co). Get the size of elements.
``` js ``` js
var size = getSize( elem ); var size = getSize( elem );
// elem can be an element // elem can be an element
var size = getSize( document.querySelector('.selector') ) var size = getSize( document.querySelector('#selector') )
// elem can be a selector string // elem can be a string, used as a query selector
var size = getSize('.selector') var size = getSize('#selector')
``` ```
Returns an object with: Returns an object with: `width`, `height`, `innerWidth/Height`, `outerWidth/Height`, `paddingLeft/Top/Right/Bottom`, `marginLeft/Top/Right/Bottom`, `borderLeft/Top/Right/BottomWidth` and `isBorderBox`.
+ width, height
+ innerWidth, innerHeight
+ outerWidth, outerHeight
+ paddingLeft, paddingTop, paddingRight, paddingBottom
+ marginLeft, marginTop, marginRight, marginBottom
+ borderLeftWidth, borderTopWidth, borderRightWidth, borderBottomWidth
+ isBorderBox
Browser support: IE10+, Android 4.0+, iOS 5+, and modern browsers Browser support: IE10+, Android 4.0+, iOS 5+, and modern browsers
## Install ## Install
Install with npm: `npm install get-size` Install with [Bower](http://bower.io): `bower install get-size`
Install with [Bower](https://bower.io): `bower install get-size` Install with npm: `npm install get-size`
## Firefox hidden iframe bug ## Firefox hidden iframe bug
@ -42,4 +34,4 @@ Install with [Bower](https://bower.io): `bower install get-size`
## MIT License ## MIT License
getSize is released under the [MIT License](https://desandro.mit-license.org/). getSize is released under the [MIT License](http://desandro.mit-license.org/).

View file

@ -1,17 +1,15 @@
{ {
"name": "get-size", "name": "get-size",
"description": "measures element size", "version": "2.0.2",
"main": "get-size.js", "main": "get-size.js",
"authors": [ "description": "measures element size",
"David DeSandro" "dependencies": {
], },
"license": "MIT", "devDependencies": {
"keywords": [ "qunit": "~1.10"
"size", },
"DOM"
],
"homepage": "https://github.com/desandro/get-size",
"ignore": [ "ignore": [
"test/",
"**/.*", "**/.*",
"package.json", "package.json",
"node_modules", "node_modules",
@ -19,5 +17,21 @@
"test", "test",
"tests", "tests",
"sandbox.html" "sandbox.html"
] ],
"homepage": "https://github.com/desandro/get-size",
"authors": [
"David DeSandro <desandrocodes@gmail.com>"
],
"moduleType": [
"amd",
"globals",
"node"
],
"keywords": [
"size",
"dom",
"width",
"height"
],
"license": "MIT"
} }

View file

@ -1,17 +1,20 @@
/*! /*!
* getSize v2.0.3 * getSize v2.0.2
* measure size of elements * measure size of elements
* MIT license * MIT license
*/ */
/* jshint browser: true, strict: true, undef: true, unused: true */ /*jshint browser: true, strict: true, undef: true, unused: true */
/* globals console: false */ /*global define: false, module: false, console: false */
( function( window, factory ) { ( function( window, factory ) {
/* jshint strict: false */ /* globals define, module */ 'use strict';
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( factory ); define( function() {
return factory();
});
} else if ( typeof module == 'object' && module.exports ) { } else if ( typeof module == 'object' && module.exports ) {
// CommonJS // CommonJS
module.exports = factory(); module.exports = factory();
@ -86,7 +89,7 @@ function getStyle( elem ) {
if ( !style ) { if ( !style ) {
logError( 'Style returned ' + style + logError( 'Style returned ' + style +
'. Are you running this code in a hidden iframe on Firefox? ' + '. Are you running this code in a hidden iframe on Firefox? ' +
'See https://bit.ly/getsizebug1' ); 'See http://bit.ly/getsizebug1' );
} }
return style; return style;
} }
@ -112,8 +115,8 @@ function setup() {
// -------------------------- box sizing -------------------------- // // -------------------------- box sizing -------------------------- //
/** /**
* Chrome & Safari measure the outer-width on style.width on border-box elems * WebKit measures the outer-width on style.width on border-box elems
* IE11 & Firefox<29 measures the inner-width * IE & Firefox<29 measures the inner-width
*/ */
var div = document.createElement('div'); var div = document.createElement('div');
div.style.width = '200px'; div.style.width = '200px';
@ -125,11 +128,10 @@ function setup() {
var body = document.body || document.documentElement; var body = document.body || document.documentElement;
body.appendChild( div ); body.appendChild( div );
var style = getStyle( div ); var style = getStyle( div );
// round value for browser zoom. desandro/masonry#928
isBoxSizeOuter = Math.round( getStyleSize( style.width ) ) == 200;
getSize.isBoxSizeOuter = isBoxSizeOuter;
getSize.isBoxSizeOuter = isBoxSizeOuter = getStyleSize( style.width ) == 200;
body.removeChild( div ); body.removeChild( div );
} }
// -------------------------- getSize -------------------------- // // -------------------------- getSize -------------------------- //

View file

@ -6,9 +6,6 @@ See demo and documentation at the [project page](http://johnpolacek.github.io/im
Requires imagesLoaded - https://github.com/desandro/imagesloaded Requires imagesLoaded - https://github.com/desandro/imagesloaded
For a jQuery-free version of this plugin, go to:
https://github.com/StudioThick/imagefill.js
* * * * * *
#### follow [@johnpolacek](https://twitter.com/johnpolacek) #### follow [@johnpolacek](https://twitter.com/johnpolacek)
* * * * * *

View file

@ -2,42 +2,42 @@
_Filter & sort magical layouts_ _Filter & sort magical layouts_
See [isotope.metafizzy.co](https://isotope.metafizzy.co) for complete docs and demos. See [isotope.metafizzy.co](http://isotope.metafizzy.co) for complete docs and demos.
## Install ## Install
### Download ### Download
+ [isotope.pkgd.js](https://unpkg.com/isotope-layout@3/dist/isotope.pkgd.js) un-minified, or + [isotope.pkgd.js](https://npmcdn.com/isotope-layout@3/dist/isotope.pkgd.js) un-minified, or
+ [isotope.pkgd.min.js](https://unpkg.com/isotope-layout@3/dist/isotope.pkgd.min.js) minified + [isotope.pkgd.min.js](https://npmcdn.com/isotope-layout@3/dist/isotope.pkgd.min.js) minified
### CDN ### CDN
Link directly to Isotope files on [unpkg](https://unpkg.com). Link directly to Isotope files on [npmcdn](https://npmcdn.com).
``` html ``` html
<script src="https://unpkg.com/isotope-layout@3/dist/isotope.pkgd.min.js"></script> <script src="https://npmcdn.com/isotope-layout@3.0/dist/isotope.pkgd.min.js"></script>
<!-- or --> <!-- or -->
<script src="https://unpkg.com/isotope-layout@3/dist/isotope.pkgd.js"></script> <script src="https://npmcdn.com/isotope-layout@3.0/dist/isotope.pkgd.js"></script>
``` ```
### Package managers ### Package managers
npm: `npm install isotope-layout --save` npm: `npm install isotope-layout --save`
Bower: `bower install isotope-layout --save` Bower: `bower install isotope --save`
## License ## License
### Commercial license ### Commercial license
If you want to use Isotope to develop commercial sites, themes, projects, and applications, the Commercial license is the appropriate license. With this option, your source code is kept proprietary. Purchase an Isotope Commercial License at [isotope.metafizzy.co](https://isotope.metafizzy.co/#commercial-license) If you want to use Isotope to develop commercial sites, themes, projects, and applications, the Commercial license is the appropriate license. With this option, your source code is kept proprietary. Purchase an Isotope Commercial License at [isotope.metafizzy.co](http://isotope.metafizzy.co/#commercial-license)
### Open source license ### Open source license
If you are creating an open source application under a license compatible with the [GNU GPL license v3](https://www.gnu.org/licenses/gpl-3.0.html), you may use Isotope under the terms of the GPLv3. If you are creating an open source application under a license compatible with the [GNU GPL license v3](https://www.gnu.org/licenses/gpl-3.0.html), you may use Isotope under the terms of the GPLv3.
[Read more about Isotope's license](https://isotope.metafizzy.co/license.html). [Read more about Isotope's license](http://isotope.metafizzy.co/license.html).
## Initialize ## Initialize
@ -82,4 +82,4 @@ Add a `data-isotope` attribute to your element. Options can be set in JSON in th
* * * * * *
By [Metafizzy 🌈🐻](https://metafizzy.co), 20102018 By [Metafizzy](http://metafizzy.co), 20102016

View file

@ -1,18 +1,18 @@
{ {
"name": "isotope-layout", "name": "isotope",
"description": "Filter and sort magical layouts", "description": "Filter and sort magical layouts",
"main": "js/isotope.js", "main": "js/isotope.js",
"dependencies": { "dependencies": {
"desandro-matches-selector": "^2.0.0", "desandro-matches-selector": "^2.0.0",
"fizzy-ui-utils": "^2.0.4", "fizzy-ui-utils": "^2.0.0",
"get-size": "^2.0.0", "get-size": "^2.0.0",
"masonry-layout": "^4.1.0", "masonry": "^4.1.0",
"outlayer": "^2.1.0" "outlayer": "^2.1.0"
}, },
"devDependencies": { "devDependencies": {
"jquery": "^3.3.1", "jquery": "2 < 4",
"jquery-bridget": "^2", "jquery-bridget": "^2",
"qunit": "^2.6.0" "qunit": "^1.15"
}, },
"ignore": [ "ignore": [
"test/", "test/",
@ -25,7 +25,7 @@
"test", "test",
"tests" "tests"
], ],
"homepage": "https://isotope.metafizzy.co", "homepage": "http://isotope.metafizzy.co",
"authors": [ "authors": [
"David DeSandro" "David DeSandro"
], ],

View file

@ -1,28 +1,29 @@
/*! /*!
* Isotope PACKAGED v3.0.6 * Isotope PACKAGED v3.0.1
* *
* Licensed GPLv3 for open source use * Licensed GPLv3 for open source use
* or Isotope Commercial License for commercial use * or Isotope Commercial License for commercial use
* *
* https://isotope.metafizzy.co * http://isotope.metafizzy.co
* Copyright 2010-2018 Metafizzy * Copyright 2016 Metafizzy
*/ */
/** /**
* Bridget makes jQuery widgets * Bridget makes jQuery widgets
* v2.0.1 * v2.0.0
* MIT license * MIT license
*/ */
/* jshint browser: true, strict: true, undef: true, unused: true */ /* jshint browser: true, strict: true, undef: true, unused: true */
( function( window, factory ) { ( function( window, factory ) {
// universal module definition 'use strict';
/*jshint strict: false */ /* globals define, module, require */ /* globals define: false, module: false, require: false */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'jquery-bridget/jquery-bridget',[ 'jquery' ], function( jQuery ) { define( 'jquery-bridget/jquery-bridget',[ 'jquery' ], function( jQuery ) {
return factory( window, jQuery ); factory( window, jQuery );
}); });
} else if ( typeof module == 'object' && module.exports ) { } else if ( typeof module == 'object' && module.exports ) {
// CommonJS // CommonJS
@ -153,7 +154,7 @@ return jQueryBridget;
})); }));
/** /**
* EvEmitter v1.1.0 * EvEmitter v1.0.3
* Lil' event emitter * Lil' event emitter
* MIT License * MIT License
*/ */
@ -233,14 +234,13 @@ proto.emitEvent = function( eventName, args ) {
if ( !listeners || !listeners.length ) { if ( !listeners || !listeners.length ) {
return; return;
} }
// copy over to avoid interference if .off() in listener var i = 0;
listeners = listeners.slice(0); var listener = listeners[i];
args = args || []; args = args || [];
// once stuff // once stuff
var onceListeners = this._onceEvents && this._onceEvents[ eventName ]; var onceListeners = this._onceEvents && this._onceEvents[ eventName ];
for ( var i=0; i < listeners.length; i++ ) { while ( listener ) {
var listener = listeners[i]
var isOnce = onceListeners && onceListeners[ listener ]; var isOnce = onceListeners && onceListeners[ listener ];
if ( isOnce ) { if ( isOnce ) {
// remove listener // remove listener
@ -251,34 +251,35 @@ proto.emitEvent = function( eventName, args ) {
} }
// trigger listener // trigger listener
listener.apply( this, args ); listener.apply( this, args );
// get next listener
i += isOnce ? 0 : 1;
listener = listeners[i];
} }
return this; return this;
}; };
proto.allOff = function() {
delete this._events;
delete this._onceEvents;
};
return EvEmitter; return EvEmitter;
})); }));
/*! /*!
* getSize v2.0.3 * getSize v2.0.2
* measure size of elements * measure size of elements
* MIT license * MIT license
*/ */
/* jshint browser: true, strict: true, undef: true, unused: true */ /*jshint browser: true, strict: true, undef: true, unused: true */
/* globals console: false */ /*global define: false, module: false, console: false */
( function( window, factory ) { ( function( window, factory ) {
/* jshint strict: false */ /* globals define, module */ 'use strict';
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'get-size/get-size',factory ); define( 'get-size/get-size',[],function() {
return factory();
});
} else if ( typeof module == 'object' && module.exports ) { } else if ( typeof module == 'object' && module.exports ) {
// CommonJS // CommonJS
module.exports = factory(); module.exports = factory();
@ -353,7 +354,7 @@ function getStyle( elem ) {
if ( !style ) { if ( !style ) {
logError( 'Style returned ' + style + logError( 'Style returned ' + style +
'. Are you running this code in a hidden iframe on Firefox? ' + '. Are you running this code in a hidden iframe on Firefox? ' +
'See https://bit.ly/getsizebug1' ); 'See http://bit.ly/getsizebug1' );
} }
return style; return style;
} }
@ -379,8 +380,8 @@ function setup() {
// -------------------------- box sizing -------------------------- // // -------------------------- box sizing -------------------------- //
/** /**
* Chrome & Safari measure the outer-width on style.width on border-box elems * WebKit measures the outer-width on style.width on border-box elems
* IE11 & Firefox<29 measures the inner-width * IE & Firefox<29 measures the inner-width
*/ */
var div = document.createElement('div'); var div = document.createElement('div');
div.style.width = '200px'; div.style.width = '200px';
@ -392,11 +393,10 @@ function setup() {
var body = document.body || document.documentElement; var body = document.body || document.documentElement;
body.appendChild( div ); body.appendChild( div );
var style = getStyle( div ); var style = getStyle( div );
// round value for browser zoom. desandro/masonry#928
isBoxSizeOuter = Math.round( getStyleSize( style.width ) ) == 200;
getSize.isBoxSizeOuter = isBoxSizeOuter;
getSize.isBoxSizeOuter = isBoxSizeOuter = getStyleSize( style.width ) == 200;
body.removeChild( div ); body.removeChild( div );
} }
// -------------------------- getSize -------------------------- // // -------------------------- getSize -------------------------- //
@ -474,7 +474,7 @@ return getSize;
}); });
/** /**
* matchesSelector v2.0.2 * matchesSelector v2.0.1
* matchesSelector( element, '.selector' ) * matchesSelector( element, '.selector' )
* MIT license * MIT license
*/ */
@ -500,7 +500,7 @@ return getSize;
'use strict'; 'use strict';
var matchesMethod = ( function() { var matchesMethod = ( function() {
var ElemProto = window.Element.prototype; var ElemProto = Element.prototype;
// check for the standard method name first // check for the standard method name first
if ( ElemProto.matches ) { if ( ElemProto.matches ) {
return 'matches'; return 'matches';
@ -528,7 +528,7 @@ return getSize;
})); }));
/** /**
* Fizzy UI utils v2.0.7 * Fizzy UI utils v2.0.2
* MIT license * MIT license
*/ */
@ -583,27 +583,22 @@ utils.modulo = function( num, div ) {
// ----- makeArray ----- // // ----- makeArray ----- //
var arraySlice = Array.prototype.slice;
// turn element or nodeList into an array // turn element or nodeList into an array
utils.makeArray = function( obj ) { utils.makeArray = function( obj ) {
var ary = [];
if ( Array.isArray( obj ) ) { if ( Array.isArray( obj ) ) {
// use object if already an array // use object if already an array
return obj; ary = obj;
} } else if ( obj && typeof obj.length == 'number' ) {
// return empty array if undefined or null. #6
if ( obj === null || obj === undefined ) {
return [];
}
var isArrayLike = typeof obj == 'object' && typeof obj.length == 'number';
if ( isArrayLike ) {
// convert nodeList to array // convert nodeList to array
return arraySlice.call( obj ); for ( var i=0; i < obj.length; i++ ) {
ary.push( obj[i] );
}
} else {
// array of single index
ary.push( obj );
} }
return ary;
// array of single index
return [ obj ];
}; };
// ----- removeFrom ----- // // ----- removeFrom ----- //
@ -618,7 +613,7 @@ utils.removeFrom = function( ary, obj ) {
// ----- getParent ----- // // ----- getParent ----- //
utils.getParent = function( elem, selector ) { utils.getParent = function( elem, selector ) {
while ( elem.parentNode && elem != document.body ) { while ( elem != document.body ) {
elem = elem.parentNode; elem = elem.parentNode;
if ( matchesSelector( elem, selector ) ) { if ( matchesSelector( elem, selector ) ) {
return elem; return elem;
@ -682,21 +677,22 @@ utils.filterFindElements = function( elems, selector ) {
// ----- debounceMethod ----- // // ----- debounceMethod ----- //
utils.debounceMethod = function( _class, methodName, threshold ) { utils.debounceMethod = function( _class, methodName, threshold ) {
threshold = threshold || 100;
// original method // original method
var method = _class.prototype[ methodName ]; var method = _class.prototype[ methodName ];
var timeoutName = methodName + 'Timeout'; var timeoutName = methodName + 'Timeout';
_class.prototype[ methodName ] = function() { _class.prototype[ methodName ] = function() {
var timeout = this[ timeoutName ]; var timeout = this[ timeoutName ];
clearTimeout( timeout ); if ( timeout ) {
clearTimeout( timeout );
}
var args = arguments; var args = arguments;
var _this = this; var _this = this;
this[ timeoutName ] = setTimeout( function() { this[ timeoutName ] = setTimeout( function() {
method.apply( _this, args ); method.apply( _this, args );
delete _this[ timeoutName ]; delete _this[ timeoutName ];
}, threshold ); }, threshold || 100 );
}; };
}; };
@ -705,8 +701,7 @@ utils.debounceMethod = function( _class, methodName, threshold ) {
utils.docReady = function( callback ) { utils.docReady = function( callback ) {
var readyState = document.readyState; var readyState = document.readyState;
if ( readyState == 'complete' || readyState == 'interactive' ) { if ( readyState == 'complete' || readyState == 'interactive' ) {
// do async to allow for other scripts to run. metafizzy/flickity#441 callback();
setTimeout( callback );
} else { } else {
document.addEventListener( 'DOMContentLoaded', callback ); document.addEventListener( 'DOMContentLoaded', callback );
} }
@ -754,7 +749,7 @@ utils.htmlInit = function( WidgetClass, namespace ) {
} }
// initialize // initialize
var instance = new WidgetClass( elem, options ); var instance = new WidgetClass( elem, options );
// make available via $().data('namespace') // make available via $().data('layoutname')
if ( jQuery ) { if ( jQuery ) {
jQuery.data( elem, namespace, instance ); jQuery.data( elem, namespace, instance );
} }
@ -904,16 +899,13 @@ proto.getPosition = function() {
var isOriginTop = this.layout._getOption('originTop'); var isOriginTop = this.layout._getOption('originTop');
var xValue = style[ isOriginLeft ? 'left' : 'right' ]; var xValue = style[ isOriginLeft ? 'left' : 'right' ];
var yValue = style[ isOriginTop ? 'top' : 'bottom' ]; var yValue = style[ isOriginTop ? 'top' : 'bottom' ];
var x = parseFloat( xValue );
var y = parseFloat( yValue );
// convert percent to pixels // convert percent to pixels
var layoutSize = this.layout.size; var layoutSize = this.layout.size;
if ( xValue.indexOf('%') != -1 ) { var x = xValue.indexOf('%') != -1 ?
x = ( x / 100 ) * layoutSize.width; ( parseFloat( xValue ) / 100 ) * layoutSize.width : parseInt( xValue, 10 );
} var y = yValue.indexOf('%') != -1 ?
if ( yValue.indexOf('%') != -1 ) { ( parseFloat( yValue ) / 100 ) * layoutSize.height : parseInt( yValue, 10 );
y = ( y / 100 ) * layoutSize.height;
}
// clean up 'auto' or other non-integer values // clean up 'auto' or other non-integer values
x = isNaN( x ) ? 0 : x; x = isNaN( x ) ? 0 : x;
y = isNaN( y ) ? 0 : y; y = isNaN( y ) ? 0 : y;
@ -976,7 +968,9 @@ proto._transitionTo = function( x, y ) {
var curX = this.position.x; var curX = this.position.x;
var curY = this.position.y; var curY = this.position.y;
var didNotMove = x == this.position.x && y == this.position.y; var compareX = parseInt( x, 10 );
var compareY = parseInt( y, 10 );
var didNotMove = compareX === this.position.x && compareY === this.position.y;
// save end position // save end position
this.setPosition( x, y ); this.setPosition( x, y );
@ -1019,8 +1013,8 @@ proto.goTo = function( x, y ) {
proto.moveTo = proto._transitionTo; proto.moveTo = proto._transitionTo;
proto.setPosition = function( x, y ) { proto.setPosition = function( x, y ) {
this.position.x = parseFloat( x ); this.position.x = parseInt( x, 10 );
this.position.y = parseFloat( y ); this.position.y = parseInt( y, 10 );
}; };
// ----- transition ----- // // ----- transition ----- //
@ -1325,7 +1319,7 @@ return Item;
})); }));
/*! /*!
* Outlayer v2.1.1 * Outlayer v2.1.0
* the brains and guts of a layout library * the brains and guts of a layout library
* MIT license * MIT license
*/ */
@ -2273,7 +2267,7 @@ return Outlayer;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'isotope-layout/js/item',[ define( 'isotope/js/item',[
'outlayer/outlayer' 'outlayer/outlayer'
], ],
factory ); factory );
@ -2351,7 +2345,7 @@ return Item;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'isotope-layout/js/layout-mode',[ define( 'isotope/js/layout-mode',[
'get-size/get-size', 'get-size/get-size',
'outlayer/outlayer' 'outlayer/outlayer'
], ],
@ -2501,9 +2495,9 @@ return Item;
})); }));
/*! /*!
* Masonry v4.2.1 * Masonry v4.1.0
* Cascading grid layout library * Cascading grid layout library
* https://masonry.desandro.com * http://masonry.desandro.com
* MIT License * MIT License
* by David DeSandro * by David DeSandro
*/ */
@ -2513,7 +2507,7 @@ return Item;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'masonry-layout/masonry',[ define( 'masonry/masonry',[
'outlayer/outlayer', 'outlayer/outlayer',
'get-size/get-size' 'get-size/get-size'
], ],
@ -2543,9 +2537,7 @@ return Item;
// isFitWidth -> fitWidth // isFitWidth -> fitWidth
Masonry.compatOptions.fitWidth = 'isFitWidth'; Masonry.compatOptions.fitWidth = 'isFitWidth';
var proto = Masonry.prototype; Masonry.prototype._resetLayout = function() {
proto._resetLayout = function() {
this.getSize(); this.getSize();
this._getMeasurement( 'columnWidth', 'outerWidth' ); this._getMeasurement( 'columnWidth', 'outerWidth' );
this._getMeasurement( 'gutter', 'outerWidth' ); this._getMeasurement( 'gutter', 'outerWidth' );
@ -2558,10 +2550,9 @@ return Item;
} }
this.maxY = 0; this.maxY = 0;
this.horizontalColIndex = 0;
}; };
proto.measureColumns = function() { Masonry.prototype.measureColumns = function() {
this.getContainerWidth(); this.getContainerWidth();
// if columnWidth is 0, default to outerWidth of first item // if columnWidth is 0, default to outerWidth of first item
if ( !this.columnWidth ) { if ( !this.columnWidth ) {
@ -2586,7 +2577,7 @@ return Item;
this.cols = Math.max( cols, 1 ); this.cols = Math.max( cols, 1 );
}; };
proto.getContainerWidth = function() { Masonry.prototype.getContainerWidth = function() {
// container is parent if fit width // container is parent if fit width
var isFitWidth = this._getOption('fitWidth'); var isFitWidth = this._getOption('fitWidth');
var container = isFitWidth ? this.element.parentNode : this.element; var container = isFitWidth ? this.element.parentNode : this.element;
@ -2596,7 +2587,7 @@ return Item;
this.containerWidth = size && size.innerWidth; this.containerWidth = size && size.innerWidth;
}; };
proto._getItemLayoutPosition = function( item ) { Masonry.prototype._getItemLayoutPosition = function( item ) {
item.getSize(); item.getSize();
// how many columns does this brick span // how many columns does this brick span
var remainder = item.size.outerWidth % this.columnWidth; var remainder = item.size.outerWidth % this.columnWidth;
@ -2604,41 +2595,33 @@ return Item;
// round if off by 1 pixel, otherwise use ceil // round if off by 1 pixel, otherwise use ceil
var colSpan = Math[ mathMethod ]( item.size.outerWidth / this.columnWidth ); var colSpan = Math[ mathMethod ]( item.size.outerWidth / this.columnWidth );
colSpan = Math.min( colSpan, this.cols ); colSpan = Math.min( colSpan, this.cols );
// use horizontal or top column position
var colPosMethod = this.options.horizontalOrder ? var colGroup = this._getColGroup( colSpan );
'_getHorizontalColPosition' : '_getTopColPosition'; // get the minimum Y value from the columns
var colPosition = this[ colPosMethod ]( colSpan, item ); var minimumY = Math.min.apply( Math, colGroup );
var shortColIndex = colGroup.indexOf( minimumY );
// position the brick // position the brick
var position = { var position = {
x: this.columnWidth * colPosition.col, x: this.columnWidth * shortColIndex,
y: colPosition.y y: minimumY
}; };
// apply setHeight to necessary columns // apply setHeight to necessary columns
var setHeight = colPosition.y + item.size.outerHeight; var setHeight = minimumY + item.size.outerHeight;
var setMax = colSpan + colPosition.col; var setSpan = this.cols + 1 - colGroup.length;
for ( var i = colPosition.col; i < setMax; i++ ) { for ( var i = 0; i < setSpan; i++ ) {
this.colYs[i] = setHeight; this.colYs[ shortColIndex + i ] = setHeight;
} }
return position; return position;
}; };
proto._getTopColPosition = function( colSpan ) {
var colGroup = this._getTopColGroup( colSpan );
// get the minimum Y value from the columns
var minimumY = Math.min.apply( Math, colGroup );
return {
col: colGroup.indexOf( minimumY ),
y: minimumY,
};
};
/** /**
* @param {Number} colSpan - number of columns the element spans * @param {Number} colSpan - number of columns the element spans
* @returns {Array} colGroup * @returns {Array} colGroup
*/ */
proto._getTopColGroup = function( colSpan ) { Masonry.prototype._getColGroup = function( colSpan ) {
if ( colSpan < 2 ) { if ( colSpan < 2 ) {
// if brick spans only one column, use all the column Ys // if brick spans only one column, use all the column Ys
return this.colYs; return this.colYs;
@ -2649,38 +2632,15 @@ return Item;
var groupCount = this.cols + 1 - colSpan; var groupCount = this.cols + 1 - colSpan;
// for each group potential horizontal position // for each group potential horizontal position
for ( var i = 0; i < groupCount; i++ ) { for ( var i = 0; i < groupCount; i++ ) {
colGroup[i] = this._getColGroupY( i, colSpan ); // make an array of colY values for that one group
var groupColYs = this.colYs.slice( i, i + colSpan );
// and get the max value of the array
colGroup[i] = Math.max.apply( Math, groupColYs );
} }
return colGroup; return colGroup;
}; };
proto._getColGroupY = function( col, colSpan ) { Masonry.prototype._manageStamp = function( stamp ) {
if ( colSpan < 2 ) {
return this.colYs[ col ];
}
// make an array of colY values for that one group
var groupColYs = this.colYs.slice( col, col + colSpan );
// and get the max value of the array
return Math.max.apply( Math, groupColYs );
};
// get column position based on horizontal index. #873
proto._getHorizontalColPosition = function( colSpan, item ) {
var col = this.horizontalColIndex % this.cols;
var isOver = colSpan > 1 && col + colSpan > this.cols;
// shift to next row if item can't fit on current row
col = isOver ? 0 : col;
// don't let zero-size items take up space
var hasSize = item.size.outerWidth && item.size.outerHeight;
this.horizontalColIndex = hasSize ? col + colSpan : this.horizontalColIndex;
return {
col: col,
y: this._getColGroupY( col, colSpan ),
};
};
proto._manageStamp = function( stamp ) {
var stampSize = getSize( stamp ); var stampSize = getSize( stamp );
var offset = this._getElementOffset( stamp ); var offset = this._getElementOffset( stamp );
// get the columns that this stamp affects // get the columns that this stamp affects
@ -2703,7 +2663,7 @@ return Item;
} }
}; };
proto._getContainerSize = function() { Masonry.prototype._getContainerSize = function() {
this.maxY = Math.max.apply( Math, this.colYs ); this.maxY = Math.max.apply( Math, this.colYs );
var size = { var size = {
height: this.maxY height: this.maxY
@ -2716,7 +2676,7 @@ return Item;
return size; return size;
}; };
proto._getContainerFitWidth = function() { Masonry.prototype._getContainerFitWidth = function() {
var unusedCols = 0; var unusedCols = 0;
// count unused columns // count unused columns
var i = this.cols; var i = this.cols;
@ -2730,7 +2690,7 @@ return Item;
return ( this.cols - unusedCols ) * this.columnWidth - this.gutter; return ( this.cols - unusedCols ) * this.columnWidth - this.gutter;
}; };
proto.needsResizeLayout = function() { Masonry.prototype.needsResizeLayout = function() {
var previousWidth = this.containerWidth; var previousWidth = this.containerWidth;
this.getContainerWidth(); this.getContainerWidth();
return previousWidth != this.containerWidth; return previousWidth != this.containerWidth;
@ -2743,7 +2703,7 @@ return Item;
/*! /*!
* Masonry layout mode * Masonry layout mode
* sub-classes Masonry * sub-classes Masonry
* https://masonry.desandro.com * http://masonry.desandro.com
*/ */
( function( window, factory ) { ( function( window, factory ) {
@ -2751,9 +2711,9 @@ return Item;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'isotope-layout/js/layout-modes/masonry',[ define( 'isotope/js/layout-modes/masonry',[
'../layout-mode', '../layout-mode',
'masonry-layout/masonry' 'masonry/masonry'
], ],
factory ); factory );
} else if ( typeof module == 'object' && module.exports ) { } else if ( typeof module == 'object' && module.exports ) {
@ -2824,7 +2784,7 @@ return Item;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'isotope-layout/js/layout-modes/fit-rows',[ define( 'isotope/js/layout-modes/fit-rows',[
'../layout-mode' '../layout-mode'
], ],
factory ); factory );
@ -2893,7 +2853,7 @@ return FitRows;
/* jshint strict: false */ /*globals define, module, require */ /* jshint strict: false */ /*globals define, module, require */
if ( typeof define == 'function' && define.amd ) { if ( typeof define == 'function' && define.amd ) {
// AMD // AMD
define( 'isotope-layout/js/layout-modes/vertical',[ define( 'isotope/js/layout-modes/vertical',[
'../layout-mode' '../layout-mode'
], ],
factory ); factory );
@ -2940,13 +2900,13 @@ return Vertical;
})); }));
/*! /*!
* Isotope v3.0.6 * Isotope v3.0.1
* *
* Licensed GPLv3 for open source use * Licensed GPLv3 for open source use
* or Isotope Commercial License for commercial use * or Isotope Commercial License for commercial use
* *
* https://isotope.metafizzy.co * http://isotope.metafizzy.co
* Copyright 2010-2018 Metafizzy * Copyright 2016 Metafizzy
*/ */
( function( window, factory ) { ( function( window, factory ) {
@ -2959,12 +2919,12 @@ return Vertical;
'get-size/get-size', 'get-size/get-size',
'desandro-matches-selector/matches-selector', 'desandro-matches-selector/matches-selector',
'fizzy-ui-utils/utils', 'fizzy-ui-utils/utils',
'isotope-layout/js/item', 'isotope/js/item',
'isotope-layout/js/layout-mode', 'isotope/js/layout-mode',
// include default layout modes // include default layout modes
'isotope-layout/js/layout-modes/masonry', 'isotope/js/layout-modes/masonry',
'isotope-layout/js/layout-modes/fit-rows', 'isotope/js/layout-modes/fit-rows',
'isotope-layout/js/layout-modes/vertical' 'isotope/js/layout-modes/vertical'
], ],
function( Outlayer, getSize, matchesSelector, utils, Item, LayoutMode ) { function( Outlayer, getSize, matchesSelector, utils, Item, LayoutMode ) {
return factory( window, Outlayer, getSize, matchesSelector, utils, Item, LayoutMode ); return factory( window, Outlayer, getSize, matchesSelector, utils, Item, LayoutMode );
@ -2977,12 +2937,12 @@ return Vertical;
require('get-size'), require('get-size'),
require('desandro-matches-selector'), require('desandro-matches-selector'),
require('fizzy-ui-utils'), require('fizzy-ui-utils'),
require('isotope-layout/js/item'), require('isotope/js/item'),
require('isotope-layout/js/layout-mode'), require('isotope/js/layout-mode'),
// include default layout modes // include default layout modes
require('isotope-layout/js/layout-modes/masonry'), require('isotope/js/layout-modes/masonry'),
require('isotope-layout/js/layout-modes/fit-rows'), require('isotope/js/layout-modes/fit-rows'),
require('isotope-layout/js/layout-modes/vertical') require('isotope/js/layout-modes/vertical')
); );
} else { } else {
// browser global // browser global
@ -3343,28 +3303,20 @@ var trim = String.prototype.trim ?
// sort filteredItem order // sort filteredItem order
proto._sort = function() { proto._sort = function() {
if ( !this.options.sortBy ) { var sortByOpt = this.options.sortBy;
if ( !sortByOpt ) {
return; return;
} }
// keep track of sortBy History // concat all sortBy and sortHistory
var sortBys = utils.makeArray( this.options.sortBy ); var sortBys = [].concat.apply( sortByOpt, this.sortHistory );
if ( !this._getIsSameSortBy( sortBys ) ) {
// concat all sortBy and sortHistory, add to front, oldest goes in last
this.sortHistory = sortBys.concat( this.sortHistory );
}
// sort magic // sort magic
var itemSorter = getItemSorter( this.sortHistory, this.options.sortAscending ); var itemSorter = getItemSorter( sortBys, this.options.sortAscending );
this.filteredItems.sort( itemSorter ); this.filteredItems.sort( itemSorter );
}; // keep track of sortBy History
if ( sortByOpt != this.sortHistory[0] ) {
// check if sortBys is same as start of sortHistory // add to front, oldest goes in last
proto._getIsSameSortBy = function( sortBys ) { this.sortHistory.unshift( sortByOpt );
for ( var i=0; i < sortBys.length; i++ ) {
if ( sortBys[i] != this.sortHistory[i] ) {
return false;
}
} }
return true;
}; };
// returns a function used for sorting // returns a function used for sorting

File diff suppressed because one or more lines are too long

View file

@ -56,7 +56,7 @@ function addBanner( str ) {
var rjsOptimize = require('gulp-requirejs-optimize'); var rjsOptimize = require('gulp-requirejs-optimize');
gulp.task( 'requirejs', function() { gulp.task( 'requirejs', function() {
var definitionRE = /define\(\s*'isotope\-layout\/\js\/isotope'(.|\n)+\],/; var definitionRE = /define\(\s*'isotope\/isotope'(.|\n)+\],/;
var banner = getBanner(); var banner = getBanner();
// HACK src is not needed // HACK src is not needed
// should refactor rjsOptimize to produce src // should refactor rjsOptimize to produce src
@ -66,20 +66,21 @@ gulp.task( 'requirejs', function() {
optimize: 'none', optimize: 'none',
include: [ include: [
'jquery-bridget/jquery-bridget', 'jquery-bridget/jquery-bridget',
'isotope-layout/js/isotope' 'isotope/isotope'
], ],
paths: { paths: {
'isotope-layout': '../', isotope: '../js/',
jquery: 'empty:' jquery: 'empty:'
} }
}) ) }) )
// munge AMD definition // munge AMD definition
.pipe( replace( definitionRE, function( definition ) { .pipe( replace( definitionRE, function( definition ) {
// remove named module // remove named module
return definition.replace( "'isotope-layout/js/isotope',", '' ) return definition.replace( "'isotope/isotope',", '' )
// use explicit file paths, './item' -> 'isotope-layout/js/item' // use explicit file paths, './item' -> 'isotope/js/item'
.replace( /'.\//g, "'isotope-layout/js/" ); .replace( /'.\//g, "'isotope/js/" );
}) ) }) )
.pipe( replace( "define( 'isotope/", "define( 'isotope/js/" ) )
// add banner // add banner
.pipe( addBanner( banner ) ) .pipe( addBanner( banner ) )
.pipe( rename('isotope.pkgd.js') ) .pipe( rename('isotope.pkgd.js') )
@ -120,12 +121,17 @@ gulp.task( 'version', function() {
gutil.log( 'ticking version to ' + chalk.green( version ) ); gutil.log( 'ticking version to ' + chalk.green( version ) );
gulp.src('js/isotope.js') gulp.src('js/isotope.js')
.pipe( replace( /Isotope v\d\.\d+\.\d+/, 'Isotope v' + version ) ) .pipe( replace( /Packery v\d\.\d+\.\d+/, 'Isotope v' + version ) )
.pipe( gulp.dest('js') ); .pipe( gulp.dest('js') );
gulp.src( [ 'package.json' ] ) gulp.src( [ 'package.json' ] )
.pipe( replace( /"version": "\d\.\d+\.\d+"/, '"version": "' + version + '"' ) ) .pipe( replace( /"version": "\d\.\d+\.\d+"/, '"version": "' + version + '"' ) )
.pipe( gulp.dest('.') ); .pipe( gulp.dest('.') );
// replace CDN links in README
var minorVersion = version.match( /^\d\.\d+/ )[0];
gulp.src('README.md')
.pipe( replace( /isotope-layout@\d\.\d+/g, 'isotope-layout@' + minorVersion ))
.pipe( gulp.dest('.') );
}); });
// ----- default ----- // // ----- default ----- //

View file

@ -1,11 +1,11 @@
/*! /*!
* Isotope v3.0.6 * Isotope v3.0.1
* *
* Licensed GPLv3 for open source use * Licensed GPLv3 for open source use
* or Isotope Commercial License for commercial use * or Isotope Commercial License for commercial use
* *
* https://isotope.metafizzy.co * http://isotope.metafizzy.co
* Copyright 2010-2018 Metafizzy * Copyright 2016 Metafizzy
*/ */
( function( window, factory ) { ( function( window, factory ) {
@ -402,28 +402,20 @@ var trim = String.prototype.trim ?
// sort filteredItem order // sort filteredItem order
proto._sort = function() { proto._sort = function() {
if ( !this.options.sortBy ) { var sortByOpt = this.options.sortBy;
if ( !sortByOpt ) {
return; return;
} }
// keep track of sortBy History // concat all sortBy and sortHistory
var sortBys = utils.makeArray( this.options.sortBy ); var sortBys = [].concat.apply( sortByOpt, this.sortHistory );
if ( !this._getIsSameSortBy( sortBys ) ) {
// concat all sortBy and sortHistory, add to front, oldest goes in last
this.sortHistory = sortBys.concat( this.sortHistory );
}
// sort magic // sort magic
var itemSorter = getItemSorter( this.sortHistory, this.options.sortAscending ); var itemSorter = getItemSorter( sortBys, this.options.sortAscending );
this.filteredItems.sort( itemSorter ); this.filteredItems.sort( itemSorter );
}; // keep track of sortBy History
if ( sortByOpt != this.sortHistory[0] ) {
// check if sortBys is same as start of sortHistory // add to front, oldest goes in last
proto._getIsSameSortBy = function( sortBys ) { this.sortHistory.unshift( sortByOpt );
for ( var i=0; i < sortBys.length; i++ ) {
if ( sortBys[i] != this.sortHistory[i] ) {
return false;
}
} }
return true;
}; };
// returns a function used for sorting // returns a function used for sorting

View file

@ -1,7 +1,7 @@
/*! /*!
* Masonry layout mode * Masonry layout mode
* sub-classes Masonry * sub-classes Masonry
* https://masonry.desandro.com * http://masonry.desandro.com
*/ */
( function( window, factory ) { ( function( window, factory ) {
@ -11,7 +11,7 @@
// AMD // AMD
define( [ define( [
'../layout-mode', '../layout-mode',
'masonry-layout/masonry' 'masonry/masonry'
], ],
factory ); factory );
} else if ( typeof module == 'object' && module.exports ) { } else if ( typeof module == 'object' && module.exports ) {

View file

@ -133,16 +133,13 @@ proto.getPosition = function() {
var isOriginTop = this.layout._getOption('originTop'); var isOriginTop = this.layout._getOption('originTop');
var xValue = style[ isOriginLeft ? 'left' : 'right' ]; var xValue = style[ isOriginLeft ? 'left' : 'right' ];
var yValue = style[ isOriginTop ? 'top' : 'bottom' ]; var yValue = style[ isOriginTop ? 'top' : 'bottom' ];
var x = parseFloat( xValue );
var y = parseFloat( yValue );
// convert percent to pixels // convert percent to pixels
var layoutSize = this.layout.size; var layoutSize = this.layout.size;
if ( xValue.indexOf('%') != -1 ) { var x = xValue.indexOf('%') != -1 ?
x = ( x / 100 ) * layoutSize.width; ( parseFloat( xValue ) / 100 ) * layoutSize.width : parseInt( xValue, 10 );
} var y = yValue.indexOf('%') != -1 ?
if ( yValue.indexOf('%') != -1 ) { ( parseFloat( yValue ) / 100 ) * layoutSize.height : parseInt( yValue, 10 );
y = ( y / 100 ) * layoutSize.height;
}
// clean up 'auto' or other non-integer values // clean up 'auto' or other non-integer values
x = isNaN( x ) ? 0 : x; x = isNaN( x ) ? 0 : x;
y = isNaN( y ) ? 0 : y; y = isNaN( y ) ? 0 : y;
@ -205,7 +202,9 @@ proto._transitionTo = function( x, y ) {
var curX = this.position.x; var curX = this.position.x;
var curY = this.position.y; var curY = this.position.y;
var didNotMove = x == this.position.x && y == this.position.y; var compareX = parseInt( x, 10 );
var compareY = parseInt( y, 10 );
var didNotMove = compareX === this.position.x && compareY === this.position.y;
// save end position // save end position
this.setPosition( x, y ); this.setPosition( x, y );
@ -248,8 +247,8 @@ proto.goTo = function( x, y ) {
proto.moveTo = proto._transitionTo; proto.moveTo = proto._transitionTo;
proto.setPosition = function( x, y ) { proto.setPosition = function( x, y ) {
this.position.x = parseFloat( x ); this.position.x = parseInt( x, 10 );
this.position.y = parseFloat( y ); this.position.y = parseInt( y, 10 );
}; };
// ----- transition ----- // // ----- transition ----- //

View file

@ -1,5 +1,5 @@
/*! /*!
* Outlayer v2.1.1 * Outlayer v2.1.0
* the brains and guts of a layout library * the brains and guts of a layout library
* MIT license * MIT license
*/ */

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,24 @@
[ [
{
"title": "Chance, Artificial Intelligence and Computer Art",
"description": "Fabrizio Poltronieri is an artist who explores the relationship between technology and deep-rooted philosophical concepts, such as chance. His current artwork involves Artificial Intelligence, applying machine and deep learning techniques to create and design narratives, moving images and objects. Poltronieri dedicates his artistic and academic research to the development of creative computing. He is a self-taught programmer who started to code during his childhood. His first degree was in Maths, he has a Master Degree in Education and Culture and holds a PhD in Semiotics from the Pontifical Catholic University of São Paulo (PUC/SP). Poltronieri is a senior lecturer and permanent member of the IOCT (Institute of Creative Technologies) at De Montfort University, Leicester, UK, supervising PhD students and teaching creative code in the Digital Arts MA. His theoretical texts and essays are often published in international books and journals, such as the Revista Brasileira (Brazilian Academy of Letters). He has written chapters for the books Rethinking gamification and The permanence of the transient: precariousness in art, of which he was also the co-editor. He is also the co-author of the book Explorations in art and technology and winner of the Itaú Rumos Arte Cibernética 2011 award with the Amigóide robot. In 2018 he won this prize again to develop the artwork “Apparatus Memories”.",
"artist": "Fabrizio Augusto Poltronieri",
"talk_video_url": "",
"topics": "computer art, chance, creative ai"
},
{
"title": "How to feel slightly less akward as a human in virtual and non-virtual realities",
"description": "Rita Eperjesi is a Berlin/Budapest based Hungarian new media artist/art director. She is the founder of the Creative Code community in Budapest, won several competitions for young creatives in advertising, and works with virtual reality in her free time. What she cares about the most are humans, technology and ideas. And the combinations of these: ideas moving humans. humans connecting to other humans. machines making better humans. robots generating ideas. She also likes shiny textures, bubbles an clouds.",
"artist": "Rita Eperjesi",
"talk_video_url": "",
"topics": "being human, feeling akward, creating a community, virtual reality"
}
,
{ {
"title": "", "title": "",
"description": "We are a collective of New Media artists with backgrounds from interactive media, creative coding, performance, installations, and design. Our goal is to find balance between artistic concept and aesthetics, we always attempt to tackle the problem from social-political, design, to relational among other interdisciplinary perspectives. We believe having strong roots enables us to reach for the sky and diversity of ideas and cultures is the key to the future.", "description": "We are a collective of New Media artists with backgrounds from interactive media, creative coding, performance, installations, and design. Our goal is to find balance between artistic concept and aesthetics, we always attempt to tackle the problem from social-political, design, to relational among other interdisciplinary perspectives. We believe having strong roots enables us to reach for the sky and diversity of ideas and cultures is the key to the future.",

View file

@ -4,19 +4,31 @@
<title>Scope Sessions Artist talks &amp; media salon</title> <title>Scope Sessions Artist talks &amp; media salon</title>
<description>Scope is a meeting point for the creative and the curious, a platform for sharing and learning in an informal setting. Guest artists are invited to present a project, a concept, a process or an experience. The presentations are short, around 40 minutes and unrestricted in form. Each session offers a variety of topics and approaches; Scope is about exposure, not for the artist, but for the audience. If you wish to share at one of our sessions send us a mail to mail [at] scopesessions [dot] org. Our focus is on intermedia arts and technologies, but we love to be surprised..! <description>Scope is a meeting point for the creative and the curious, a platform for sharing and learning in an informal setting. Guest artists are invited to present a project, a concept, a process or an experience. The presentations are short, around 40 minutes and unrestricted in form. Each session offers a variety of topics and approaches; Scope is about exposure, not for the artist, but for the audience. If you wish to share at one of our sessions send us a mail to mail [at] scopesessions [dot] org. Our focus is on intermedia arts and technologies, but we love to be surprised..!
</description> </description>
<link>http://scopesessions.org/</link> <link>http://localhost:4000/</link>
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" /> <atom:link href="http://localhost:4000 /feed.xml " rel="self" type="application/rss+xml" />
<pubDate>Wed, 12 Jun 2019 08:44:48 +0200</pubDate> <pubDate>Mon, 30 Sep 2019 10:44:20 +0200</pubDate>
<lastBuildDate>Wed, 12 Jun 2019 08:44:48 +0200</lastBuildDate> <lastBuildDate>Mon, 30 Sep 2019 10:44:20 +0200</lastBuildDate>
<generator>Jekyll v3.3.1</generator> <generator>Jekyll v3.8.3</generator>
<item>
<title>086</title>
<description>
</description>
<pubDate>Thu, 10 Oct 2019 00:00:00 +0200</pubDate>
<link>http://localhost:4000/session/2019/10/10/086.html</link>
<guid isPermaLink="true">http://localhost:4000/session/2019/10/10/086.html</guid>
<category>session</category>
</item>
<item> <item>
<title>084</title> <title>084</title>
<description> <description>
</description> </description>
<pubDate>Thu, 13 Jun 2019 00:00:00 +0200</pubDate> <pubDate>Thu, 13 Jun 2019 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2019/06/13/084.html</link> <link>http://localhost:4000/session/2019/06/13/084.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2019/06/13/084.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2019/06/13/084.html</guid>
<category>session</category> <category>session</category>
@ -27,8 +39,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 09 May 2019 00:00:00 +0200</pubDate> <pubDate>Thu, 09 May 2019 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2019/05/09/083.html</link> <link>http://localhost:4000/session/2019/05/09/083.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2019/05/09/083.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2019/05/09/083.html</guid>
<category>session</category> <category>session</category>
@ -39,8 +51,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 07 Feb 2019 00:00:00 +0100</pubDate> <pubDate>Thu, 07 Feb 2019 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2019/02/07/080.html</link> <link>http://localhost:4000/session/2019/02/07/080.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2019/02/07/080.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2019/02/07/080.html</guid>
<category>session</category> <category>session</category>
@ -51,8 +63,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 10 Jan 2019 00:00:00 +0100</pubDate> <pubDate>Thu, 10 Jan 2019 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2019/01/10/079.html</link> <link>http://localhost:4000/session/2019/01/10/079.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2019/01/10/079.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2019/01/10/079.html</guid>
<category>session</category> <category>session</category>
@ -63,8 +75,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 13 Dec 2018 00:00:00 +0100</pubDate> <pubDate>Thu, 13 Dec 2018 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2018/12/13/078.html</link> <link>http://localhost:4000/session/2018/12/13/078.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/12/13/078.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2018/12/13/078.html</guid>
<category>session</category> <category>session</category>
@ -75,8 +87,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 08 Nov 2018 00:00:00 +0100</pubDate> <pubDate>Thu, 08 Nov 2018 00:00:00 +0100</pubDate>
<link>http://scopesessions.org/session/2018/11/08/077.html</link> <link>http://localhost:4000/session/2018/11/08/077.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/11/08/077.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2018/11/08/077.html</guid>
<category>session</category> <category>session</category>
@ -87,8 +99,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 11 Oct 2018 00:00:00 +0200</pubDate> <pubDate>Thu, 11 Oct 2018 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2018/10/11/076.html</link> <link>http://localhost:4000/session/2018/10/11/076.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/10/11/076.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2018/10/11/076.html</guid>
<category>session</category> <category>session</category>
@ -99,8 +111,8 @@
<description> <description>
</description> </description>
<pubDate>Thu, 13 Sep 2018 00:00:00 +0200</pubDate> <pubDate>Thu, 13 Sep 2018 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2018/09/13/075.html</link> <link>http://localhost:4000/session/2018/09/13/075.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/09/13/075.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2018/09/13/075.html</guid>
<category>session</category> <category>session</category>
@ -111,20 +123,8 @@
<description> <description>
</description> </description>
<pubDate>Fri, 15 Jun 2018 00:00:00 +0200</pubDate> <pubDate>Fri, 15 Jun 2018 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2018/06/15/7th_birthday.html</link> <link>http://localhost:4000/session/2018/06/15/7th_birthday.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/06/15/7th_birthday.html</guid> <guid isPermaLink="true">http://localhost:4000/session/2018/06/15/7th_birthday.html</guid>
<category>session</category>
</item>
<item>
<title>074</title>
<description>
</description>
<pubDate>Thu, 10 May 2018 00:00:00 +0200</pubDate>
<link>http://scopesessions.org/session/2018/05/10/074.html</link>
<guid isPermaLink="true">http://scopesessions.org/session/2018/05/10/074.html</guid>
<category>session</category> <category>session</category>

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 KiB

BIN
_site/images/uszi.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -16,7 +16,7 @@
<tbody> <tbody>
<tr> <tr>
<td class="mcnImageContent" style="padding-right: 9px;padding-left: 9px;padding-top: 0;padding-bottom: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" valign="top"> <td class="mcnImageContent" style="padding-right: 9px;padding-left: 9px;padding-top: 0;padding-bottom: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" valign="top">
<img alt="" src="http://scopesessions.org/images/automaton.jpg" style="max-width: 3786px;padding-bottom: 0;display: inline !important;vertical-align: bottom;border: 0;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" class="mcnImage" <img alt="" src="http://scopesessions.org/images/fabrizio_poltronieri.jpg" style="max-width: 3786px;padding-bottom: 0;display: inline !important;vertical-align: bottom;border: 0;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" class="mcnImage"
width="564" align="left"> width="564" align="left">
</td> </td>
</tr> </tr>
@ -40,18 +40,18 @@
valign="top"> valign="top">
<h3 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 18px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: -.5px;text-align: left;color: #606060 !important;"> <h3 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 18px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: -.5px;text-align: left;color: #606060 !important;">
<span class="fsl">20:00 / </span> <span class="fsl">20:00 / Chance, Artificial Intelligence and Computer Art</span>
</h3> </h3>
<h4 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 16px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: normal;text-align: left;color: #808080 !important;"> <h4 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 16px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: normal;text-align: left;color: #808080 !important;">
<a href="http://www.automatonlab.com" target="_blank" style="word-wrap: break-word;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #6DC6DD;font-weight: normal;text-decoration: underline;"> <a href="http://www.fabriziopoltronieri.com" target="_blank" style="word-wrap: break-word;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #6DC6DD;font-weight: normal;text-decoration: underline;">
<span class="fsl">Automaton Lab</span> <span class="fsl">Fabrizio Augusto Poltronieri</span>
</a> </a>
</h4> </h4>
<span class="fsl"></span> <span class="fsl"></span>
<br> <br>
<br> <br>
<span class="fsl">We are a collective of New Media artists with backgrounds from interactive media, creative coding, performance, installations, and design. Our goal is to find balance between artistic concept and aesthetics, we always attempt to tackle the problem from social-political, design, to relational among other interdisciplinary perspectives. We believe having strong roots enables us to reach for the sky and diversity of ideas and cultures is the key to the future.</span> <span class="fsl">Fabrizio Poltronieri is an artist who explores the relationship between technology and deep-rooted philosophical concepts, such as chance. His current artwork involves Artificial Intelligence, applying machine and deep learning techniques to create and design narratives, moving images and objects. Poltronieri dedicates his artistic and academic research to the development of creative computing. He is a self-taught programmer who started to code during his childhood. His first degree was in Maths, he has a Master Degree in Education and Culture and holds a PhD in Semiotics from the Pontifical Catholic University of São Paulo (PUC/SP). Poltronieri is a senior lecturer and permanent member of the IOCT (Institute of Creative Technologies) at De Montfort University, Leicester, UK, supervising PhD students and teaching creative code in the Digital Arts MA. His theoretical texts and essays are often published in international books and journals, such as the Revista Brasileira (Brazilian Academy of Letters). He has written chapters for the books Rethinking gamification and The permanence of the transient: precariousness in art, of which he was also the co-editor. He is also the co-author of the book Explorations in art and technology and winner of the Itaú Rumos Arte Cibernética 2011 award with the Amigóide robot. In 2018 he won this prize again to develop the artwork “Apparatus Memories”.</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -96,7 +96,7 @@
<tbody> <tbody>
<tr> <tr>
<td class="mcnImageContent" style="padding-right: 9px;padding-left: 9px;padding-top: 0;padding-bottom: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" valign="top"> <td class="mcnImageContent" style="padding-right: 9px;padding-left: 9px;padding-top: 0;padding-bottom: 0;mso-table-lspace: 0pt;mso-table-rspace: 0pt;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;" valign="top">
<img alt="" src="http://scopesessions.org/images/vanta.png" style="max-width: 3786px;padding-bottom: 0;display: inline !important;vertical-align: bottom;border: 0;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" class="mcnImage" <img alt="" src="http://scopesessions.org/images/uszi.jpg" style="max-width: 3786px;padding-bottom: 0;display: inline !important;vertical-align: bottom;border: 0;outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;" class="mcnImage"
width="564" align="left"> width="564" align="left">
</td> </td>
</tr> </tr>
@ -120,21 +120,18 @@
valign="top"> valign="top">
<h3 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 18px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: -.5px;text-align: left;color: #606060 !important;"> <h3 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 18px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: -.5px;text-align: left;color: #606060 !important;">
<span class="fsl">21:00 / <<Cables>> How to connect one thing to another!</span> <span class="fsl">21:00 / How to feel slightly less akward as a human in virtual and non-virtual realities</span>
</h3> </h3>
<h4 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 16px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: normal;text-align: left;color: #808080 !important;"> <h4 class="null" style="margin: 0;padding: 0;display: block;font-family: Helvetica;font-size: 16px;font-style: normal;font-weight: bold;line-height: 125%;letter-spacing: normal;text-align: left;color: #808080 !important;">
<a href="http://vanta.xyz" target="_blank" style="word-wrap: break-word;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #6DC6DD;font-weight: normal;text-decoration: underline;"> <a href="http://rita.cloud" target="_blank" style="word-wrap: break-word;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: #6DC6DD;font-weight: normal;text-decoration: underline;">
<span class="fsl">VanTa</span> <span class="fsl">Rita Eperjesi</span>
</a> </a>
</h4> </h4>
<span class="fsl"></span> <span class="fsl"></span>
<br> <br>
<br> <br>
<span class="fsl">VanTa is an experienced developer, with a strong focus in the field of computer graphics. <span class="fsl">Rita Eperjesi is a Berlin/Budapest based Hungarian new media artist/art director. She is the founder of the Creative Code community in Budapest, won several competitions for young creatives in advertising, and works with virtual reality in her free time. What she cares about the most are humans, technology and ideas. And the combinations of these: ideas moving humans. humans connecting to other humans. machines making better humans. robots generating ideas. She also likes shiny textures, bubbles an clouds.</span>
In his creations, he always tries to find a balance between geometry, abstraction, and chaos.
At the age of eight he left home and founded his own aerospace startup with very little venture capital, that operated from his parents porch.
With a background in environmental science, his work revolves around the intersection between art, science, and technology. He loves when digital elements align with the real world; either in augmented reality overlays, projection mapping on architectural landmarks, or pixels floating in thin air. VanTa also performs as a VJ and musician in different locations and festivals around the world. When he finds the time, he teaches coding to designers and artists.</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -163,7 +160,7 @@ With a background in environmental science, his work revolves around the interse
</tbody> </tbody>
</table> </table>
</body> </body>
</html> </html>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Some files were not shown because too many files have changed in this diff Show more