Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: code418/jquery-swipe-events
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jquery-archive/jquery-mobile
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
11 contributors

Commits on Jun 21, 2012

  1. Fixes: jquery-archive#1181 - navbar link stays active when using chan… 

    …gePage()

Clears the active button class on the pressed navbar button after a
pagechange.
    Jason Scott committed Jun 21, 2012
    Copy the full SHA
    f8abd04 View commit details

Commits on Aug 13, 2012

  1. add config to disable base changes all together

    @johnbender
    johnbender committed Aug 13, 2012
    Copy the full SHA
    b2bc9b3 View commit details

  2. add tests for disabling base tag support and url alteration

    @johnbender
    johnbender committed Aug 13, 2012
    Copy the full SHA
    126a98f View commit details

  3. account for push state disabled tests

    @johnbender
    johnbender committed Aug 13, 2012
    Copy the full SHA
    10f2acd View commit details

Commits on Aug 20, 2012

  1. default to the base href when dynamiceBase is disabled

    @johnbender
    johnbender committed Aug 20, 2012
    Copy the full SHA
    0cdd99c View commit details

Commits on Sep 28, 2012

  1. first pass at supporting query params in the hash Fixes jquery-archiv… 

    …e#5085

This commit strips any query string from the hash when referencing an internal
page. This allows users to reference exising pages but communicate information
to parts of their application and allows users to use a singple page to do
different things with the page event bindings to do so.

The information about the url is preserved under the data.options object provided
to the page lifecycle events as data.options.target which will contain the original url.
    @johnbender
    johnbender committed Sep 28, 2012
    Copy the full SHA
    57d7752 View commit details

Commits on Oct 1, 2012

  1. create, store, and pass the absolute url in all page lifecycle events… 

    … on the trigger data object
    @johnbender
    johnbender committed Oct 1, 2012
    Copy the full SHA
    c6c9858 View commit details

  2. use existing api property name for consistency

    @johnbender
    johnbender committed Oct 1, 2012
    Copy the full SHA
    eb1c86d View commit details

  3. fix for pagechange value and test of 3 page change events

    @johnbender
    johnbender committed Oct 1, 2012
    Copy the full SHA
    951525b View commit details

Commits on Oct 2, 2012

  1. basic event normalization

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    440e960 View commit details

  2. clean up the navigate special event

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    57c0412 View commit details

  3. quick mutex cleanup

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    702332f View commit details

  4. tests for navigate event

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    16c1473 View commit details

  5. setup tests to handle both support cases

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    932906c View commit details

  6. namespace popstate and hashchange bindings

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    a08e1e8 View commit details

  7. move event to events/navigate in preparation for back and forward

    @johnbender
    johnbender committed Oct 2, 2012
    Copy the full SHA
    0543a8b View commit details

Commits on Oct 3, 2012

  1. note on deps

    @johnbender
    johnbender committed Oct 3, 2012
    Copy the full SHA
    cd1053d View commit details

Commits on Oct 10, 2012

  1. split out path for future direct reference

    @johnbender
    johnbender committed Oct 10, 2012
    Copy the full SHA
    f0ce8c7 View commit details

  2. abstract path helpers

    @johnbender
    johnbender committed Oct 10, 2012
    Copy the full SHA
    cb636c5 View commit details

  3. allow users to provide state to further normalize the navigation events

    @johnbender
    johnbender committed Oct 10, 2012
    Copy the full SHA
    42a8592 View commit details

  4. use originalEvent in preference to from

    @johnbender
    johnbender committed Oct 10, 2012
    Copy the full SHA
    6faccf8 View commit details

Commits on Oct 11, 2012

  1. remove old TODOs

    @johnbender
    johnbender committed Oct 11, 2012
    Copy the full SHA
    ddcf7c7 View commit details

  2. include the navigate method to do history tracking and state inclusio… 

    …n for hashchange
    @johnbender
    johnbender committed Oct 11, 2012
    Copy the full SHA
    4677f5a View commit details

  3. tests for navigate event state should work with both popstate and has… 

    …hchange

This commit deserves some explanation, particularly the popstate binding
that was added. It appears at least in initial testing with Chrome, that
changing the hash _stops_ execution of the current stackframe and proceeds
to trigger a popstate event. As a result that popstate event needs to be
swallowed until we can make the replaceState modifications to the url.

In short we're keeping the even structure serialized so that the behavior
is easy to deal with. A bit of further work might store the originalEvent
for use with the synthetic version of popstate that's triggered.
    @johnbender
    johnbender committed Oct 11, 2012
    Copy the full SHA
    c146203 View commit details

  4. todos and push state glob catch

    @johnbender
    johnbender committed Oct 11, 2012
    Copy the full SHA
    4205937 View commit details

Commits on Oct 12, 2012

  1. adapt the event cascade abstraction to clean up navigate tests

    @johnbender
    johnbender committed Oct 12, 2012
    Copy the full SHA
    9df8dc3 View commit details

  2. update test comments

    @johnbender
    johnbender committed Oct 12, 2012
    Copy the full SHA
    c9ba67f View commit details

Commits on Oct 17, 2012

  1. prefer backward history movement, tests to accompany

    @johnbender
    johnbender committed Oct 17, 2012
    Copy the full SHA
    3217489 View commit details

  2. remove unused variable declarations

    @johnbender
    johnbender committed Oct 17, 2012
    Copy the full SHA
    94dbe55 View commit details

Commits on Oct 19, 2012

  1. provide history and directionality to popstate based navigate event

    @johnbender
    johnbender committed Oct 19, 2012
    Copy the full SHA
    66edbea View commit details

Commits on Oct 25, 2012

  1. move the hash alteration below the snippets that determine the data t… 

    …hat will go into a navigate call
    @johnbender
    johnbender committed Oct 25, 2012
    Copy the full SHA
    3974794 View commit details

Commits on Oct 30, 2012

  1. basic hash assignment handling

    @johnbender
    johnbender committed Oct 30, 2012
    Copy the full SHA
    9c1c15f View commit details

  2. rename callbacks in history.direct

    @johnbender
    johnbender committed Oct 30, 2012
    Copy the full SHA
    4cae082 View commit details

Commits on Oct 31, 2012

  1. tests for proper squashing in a hand full of scenarios

    @johnbender
    johnbender committed Oct 31, 2012
    Copy the full SHA
    00f81c9 View commit details

Commits on Nov 7, 2012

  1. first pass at integration, failing tests still exist

    @johnbender
    johnbender committed Nov 7, 2012
    Copy the full SHA
    611bb7d View commit details

Commits on Nov 8, 2012

  1. merge the search params when squashing makes absolutely no sense sinc… 

    …e it ruins the new url
    @johnbender
    johnbender committed Nov 8, 2012
    Copy the full SHA
    143b2b9 View commit details

Commits on Nov 12, 2012

  1. all navigation core tests passing, moving on to base tests

    @johnbender
    johnbender committed Nov 12, 2012
    Copy the full SHA
    4081267 View commit details

  2. base tests passing

    @johnbender
    johnbender committed Nov 12, 2012
    Copy the full SHA
    b43ddf8 View commit details

Commits on Nov 26, 2012

  1. Range Slider: First attempt at new range widget

    Alexander Schmitz committed Nov 26, 2012
    Copy the full SHA
    a2c564f View commit details

  2. Adding initial pieces to make slide-panels work

    @jefflembeck
    jefflembeck committed Nov 26, 2012
    Copy the full SHA
    40ff892 View commit details

Commits on Nov 27, 2012

  1. popup tests passing

    @johnbender
    johnbender committed Nov 27, 2012
    Copy the full SHA
    cc0f247 View commit details

  2. corrected issue with frozen method tests in nav

    @johnbender
    johnbender committed Nov 27, 2012
    Copy the full SHA
    f3416f2 View commit details

  3. test that beforenavigate can be used to prevent navigate event

    @johnbender
    johnbender committed Nov 27, 2012
    Copy the full SHA
    550ffe2 View commit details

  4. adde dependency on navigation helper

    @johnbender
    johnbender committed Nov 27, 2012
    Copy the full SHA
    dfef8e6 View commit details

  5. Range widget: re-thought positioning of sliders and use of css

    Alexander Schmitz committed Nov 27, 2012
    Copy the full SHA
    ed13924 View commit details

  6. Toggling on and off works with the different buttons. Push and overlay 

    are working
    @jefflembeck
    jefflembeck committed Nov 27, 2012
    Copy the full SHA
    df3bb51 View commit details

  7. Range Widget: minor position fix for mini

    Alexander Schmitz committed Nov 27, 2012
    Copy the full SHA
    611f2a4 View commit details

  8. Slider: fix lint issue

    Alexander Schmitz committed Nov 27, 2012
    Copy the full SHA
    6fd5169 View commit details

  9. Top now working

    @jefflembeck
    jefflembeck committed Nov 27, 2012
    Copy the full SHA
    c1e3c86 View commit details

  10. no history entry is added when the hash handling is turned off

    @johnbender
    johnbender committed Nov 27, 2012
    Copy the full SHA
    df6af7e View commit details
Showing 1,496 changed files with 167,941 additions and 119,956 deletions.
24 changes: 24 additions & 0 deletions .csscomb.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"remove-empty-rulesets": true,
"always-semicolon": true,
"color-case": "lower",
"block-indent": "\t",
"color-shorthand": true,
"element-case": "lower",
"eof-newline": true,
"leading-zero": false,
"quotes": "double",
"sort-order-fallback": "abc",
"space-before-colon": "",
"space-after-colon": " ",
"space-before-combinator": " ",
"space-after-combinator": " ",
"space-between-declarations": "\n",
"space-before-opening-brace": " ",
"space-after-opening-brace": "\n",
"space-after-selector-delimiter": "\n",
"space-before-selector-delimiter": "",
"space-before-closing-brace": "\n",
"strip-spaces": true,
"unitless-zero": true
}
20 changes: 20 additions & 0 deletions .csslintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"adjoining-classes": false,
"box-model": false,
"box-sizing": false,
"compatible-vendor-prefixes": false,
"duplicate-background-images": false,
"import": false,
"important": false,
"outline-none": false,
"overqualified-elements": false,
"text-indent": false,

// These are not ideal but needed for current theme
"qualified-headings": false,
"regex-selectors": false,
"unqualified-attributes": false,
"universal-selector": false,
"unique-headings": false,
"vendor-prefix": false
}
16 changes: 16 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This file is for unifying the coding style for different editors and IDEs
# See http://editorconfig.org/

root = true

[*]
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[external/**]
trim_trailing_whitespace = false
insert_final_newline = varies
end_of_line = varies
5 changes: 5 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Auto detect text files and perform LF normalization
* text=auto

# JS files must always use LF for tools to work
*.js eol=lf
7 changes: 6 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,9 @@ cache/
combined/
combine/
compiled/
dist/
tmp/
temp/
*.swp
.gitignore

@@ -17,5 +19,8 @@ branches
# node build dependencies
node_modules

# tests output
_tests/

# phantom junit output
build/test-results/
build/test-results/
6 changes: 6 additions & 0 deletions .jscsrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"preset": "jquery",

// We want to output all errors
"maxErrors": 1000000
}
16 changes: 16 additions & 0 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"immed": true,
"noarg": true,
"quotmark": "double",
"smarttabs": true,
"trailing": true,
"undef": true,
"unused": true,

"node": true
}
66 changes: 66 additions & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
Adam Messinger <adam@adammessinger.com>
Adria Jimenez <ajimix@gmail.com>
Alexander Schmitz <arschmitz@gmail.com> <alexanderschmitz@Alexanders-MacBook-Pro.local>
Alexander Schmitz <arschmitz@gmail.com> <arschmitz>
Alexandre Capt <acapt@adobe.com>
Andrew Haller <andrew.haller@aeonblu.com>
Anne-Gaelle Colom <coloma@westminster.ac.uk> <coloma@wmin.ac.uk>
Ben Clinkinbeard <ben.clinkinbeard@gmail.com>
Brad Broulik <brad.broulik@gmail.com>
Brad Broulik <brad.broulik@gmail.com> <bbroulik@yahoo.com>
Changsuk, Ha <csha71@gmail.com>
Christoph Burgdorf <christoph.burgdorf@bvsn.org>
Christopher Thomas <cwt137@gmail.com>
Cristi Citea <cristi.catea@gmail.com> patrioticcow
Curtis Mathews <cmathews@orcc.com>
Dave Methvin <dave.methvin@gmail.com>
Eddie Cianci <defeated2k4@gmail.com>
Eddie Monge <eddie@eddiemonge.com>
Eddie Monge <eddie@eddiemonge.com> <EMAIL>
Eddie Monge <eddie@eddiemonge.com> Eddie Monge <eddie@eddiemonge.com>
Eddie Monge <eddie@eddiemonge.com> Eddie Monge Jr <eddie@eddiemonge.com>
Eddie Monge <eddie@eddiemonge.com> Eddie Monge Jr. <eddie@eddiemonge.com>
Eric Hynds <eric@hynds.net>
Ernesto Jiménez <me@ernesto-jimenez.com>
Eugen Bolz <eugen.bolz@gmail.com>
Eugen Bolz <eugen.bolz@gmail.com> <info@eugen-bolz.de>
Faolan Cheslack-Postava <fcheslack@gmail.com>
Gabe Hollombe <gabe@avantbard.com> Gabe <gabe@avantbard.com>
Gabriel Schulhof <gabriel.schulhof@intel.com>
Ghislain Seguin <ghislain@gmail.com> <ghislain.seguin@jivesoftware.com>
Ghislain Seguin <ghislain@gmail.com> <ghislain.seguin@macjiver.jiveland.com>
Ghislain Seguin <ghislain@gmail.com> <ghislain@jivesoftware.com>
Ghislain Seguin <ghislain@gmail.com> <ghislain@nikita.(none)>
Ghislain Seguin <ghislain@gmail.com> gseguin
Hans-Peter Buniat <hpbuniat@gmail.com> <hpbuniat@googlemail.com>
Jacob Gable <jacob.gable@gmail.com>
Jake Boone <jakeboone02@gmail.com>
James Burke <jrburke@gmail.com>
Jason Crane <jasonlcrane@gmail.com>
Jason Scott <jasscott@blackberry.com> <me@jasondscott.com>
Jasper de Groot <jasper@ugomobi.com> <mail@ugomobi.com>
John Resig <jeresig@gmail.com>
Jonathan Hogervorst <jonathan@buzzera.com> <jonathan@hogervorst.info>
Jonathan Rowny <jrowny@gmail.com>
Jörn Zaefferer <joern.zaefferer@gmail.com>
Kangsik Kim <allsteady@gmail.com>
Maggie Wachs <maggie@filamentgroup.com>
Markandey Singh <mark.dawn@gmail.com> <markande@whilebattle-lm.(none)>
Matthew David Litwin <mlitwin@kcptech.com>
Maurice Gottlieb <magoo@maugo.de>
Max Rabin <rabin.max@gmail.com>
Oliver Frietsch <oliver.frietsch@web.de>
Patty Toland <patty@filamentgroup.com>
Peter Körner <github@mazdermind.de>
Richard Trott <rtrott@gmail.com>
Scott Jehl <scottjehl@gmail.com> <scott@scottjehl.com>
Stéphane Reynaud <forresst@voila.fr>
Sven Franck <svenfranck@yahoo.com>
Todd Parker <todd@filamentgroup.com>
Todd Parker <todd@filamentgroup.com> <todd@new-host-10.(none)>
Todd Parker <todd@filamentgroup.com> <todd@new-host-7.(none)>
Todd Parker <todd@filamentgroup.com> <todd@Todd-Parkers-MacBook-Pro.local>
Torey Maerz <toreym@gmail.com> Unknown <Torey@.(none)>
Toru Yoshikawa <pikotea@gmail.com>
Tyler Benziger <tabenziger@ucdavis.edu>
Zachary Leatherman <zachleatherman@gmail.com>
42 changes: 42 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
language: php

php:
- "5.5"

sudo: required

dist: trusty
cache:
directories:
- node_modules

before_script:
- npm install -g grunt-cli
- npm install
- npm install -g casperjs
- npm i -g npm

script: travis_wait npm run-script ci

env:
- JQUERIES=1.10.2
CITYPE=test
SUITES=-navigation/sequence/sequence-dialog-hash-key-tests.html,-navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html,-navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
- JQUERIES=1.11.3
CITYPE=test
SUITES=-navigation/sequence/sequence-dialog-hash-key-tests.html,-navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html,-navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
- JQUERIES=2.2.4
CITYPE=test
SUITES=-navigation/sequence/sequence-dialog-hash-key-tests.html,-navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html,-navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
- JQUERIES=3.0.0
CITYPE=test
SUITES=-navigation/sequence/sequence-dialog-hash-key-tests.html,-navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html,-navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
- JQUERIES=git
CITYPE=test
SUITES=-navigation/sequence/sequence-dialog-hash-key-tests.html,-navigation/sequence/sequence-push-state-disabled-path1-path2-dialog-hash-key-tests.html,-navigation/sequence/sequence-path1-path2-dialog-hash-key-tests.html
- CITYPE=demos

notifications:
irc:
channels:
- "chat.freenode.net#jqueryui-dev"
Loading