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: angular-ui/ui-router
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.3
Choose a base ref
...
head repository: angular-ui/ui-router
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.0
Choose a head ref
Loading
Showing with 64,522 additions and 146,752 deletions.
  1. +10 −5 .gitignore
  2. +15 −13 .npmignore
  3. +44 −5 .travis.yml
  4. +42 −0 .yarnclean
  5. +1,104 −0 CHANGELOG.md
  6. +58 −10 CONTRIBUTING.md
  7. +48 −0 DOCS.md
  8. +0 −241 Gruntfile.js
  9. +53 −0 ISSUE_TEMPLATE.md
  10. +24 −220 README.md
  11. +1 −24 bower.json
  12. +0 −22 component.json
  13. +0 −27 config/karma-1.0.8.js
  14. +0 −27 config/karma-1.1.5.js
  15. +0 −27 config/karma-1.2.14.js
  16. +0 −27 config/karma-1.3.0.js
  17. +0 −27 config/karma-1.4.9.js
  18. +0 −27 config/karma-1.5.0.js
  19. +0 −33 files.js
  20. +86 −0 karma.conf.js
  21. +0 −277 lib/angular-1.0.8/angular-loader.js
  22. +0 −1,805 lib/angular-1.0.8/angular-mocks.js
  23. +0 −556 lib/angular-1.0.8/angular-sanitize.js
  24. +0 −26,621 lib/angular-1.0.8/angular-scenario.js
  25. +0 −15,158 lib/angular-1.0.8/angular.js
  26. +0 −304 lib/angular-1.1.5/angular-loader.js
  27. +0 −460 lib/angular-1.1.5/angular-mobile.js
  28. +0 −1,886 lib/angular-1.1.5/angular-mocks.js
  29. +0 −558 lib/angular-1.1.5/angular-sanitize.js
  30. +0 −28,463 lib/angular-1.1.5/angular-scenario.js
  31. +0 −16,876 lib/angular-1.1.5/angular.js
  32. +0 −414 lib/angular-1.2.14/angular-loader.js
  33. +0 −624 lib/angular-1.2.14/angular-sanitize.js
  34. +0 −33,059 lib/angular-1.2.14/angular-scenario.js
  35. +0 −561 lib/angular-1.2.14/angular-touch.js
  36. +4 −0 migrate/migrate.json
  37. +12 −0 migrate/migratewarn.js
  38. BIN ngdoc_assets/StateGoExamples.png
  39. +0 −6 ngdoc_assets/docnav.html
  40. BIN ngdoc_assets/example.png
  41. BIN ngdoc_assets/incomplete.png
  42. BIN ngdoc_assets/so.png
  43. +0 −4 ngdoc_assets/uirouter-docs.css
  44. +87 −39 package.json
  45. +0 −4,539 release/angular-ui-router.js
  46. +0 −8 release/angular-ui-router.min.js
  47. +74 −0 rollup.config.js
  48. +0 −96 sample/app/app.js
  49. +0 −22 sample/app/contacts/contacts-service.js
  50. +0 −17 sample/app/contacts/contacts.detail.html
  51. +0 −3 sample/app/contacts/contacts.detail.item.edit.html
  52. +0 −3 sample/app/contacts/contacts.detail.item.html
  53. +0 −26 sample/app/contacts/contacts.html
  54. +0 −206 sample/app/contacts/contacts.js
  55. +0 −6 sample/app/contacts/contacts.list.html
  56. +0 −47 sample/assets/contacts.json
  57. +0 −24 sample/common/utils/utils-service.js
  58. +0 −24 sample/css/styles.css
  59. +0 −76 sample/index.html
  60. +0 −9 sample/vendor/bootstrap.min.css
  61. +30 −0 scripts/artifact_tagging.js
  62. +58 −0 scripts/docs.js
  63. +5 −0 scripts/ensure_clean_master.js
  64. +65 −0 scripts/release.js
  65. +28 −0 scripts/show_changelog.js
  66. +69 −0 scripts/show_core_changelog.js
  67. +15 −0 scripts/update_changelog.js
  68. +39 −0 scripts/util.js
  69. +9 −0 src/angular.ts
  70. +0 −293 src/common.js
  71. +627 −0 src/directives/stateDirectives.ts
  72. +498 −0 src/directives/viewDirective.ts
  73. +22 −0 src/index.ts
  74. +396 −0 src/injectables.ts
  75. +748 −0 src/interface.ts
  76. +2 −0 src/legacy/core-adapter.js
  77. +72 −0 src/legacy/resolveService.ts
  78. +307 −0 src/legacy/stateEvents.ts
  79. +94 −0 src/locationServices.ts
  80. +0 −252 src/resolve.js
  81. +148 −0 src/services.ts
  82. +0 −1,470 src/state.js
  83. +0 −391 src/stateDirectives.js
  84. +0 −39 src/stateFilters.js
  85. +46 −0 src/stateFilters.ts
  86. +274 −0 src/stateProvider.ts
  87. +27 −0 src/statebuilders/onEnterExitRetain.ts
  88. +128 −0 src/statebuilders/views.ts
  89. +0 −110 src/templateFactory.js
  90. +209 −0 src/templateFactory.ts
  91. +0 −1,081 src/urlMatcherFactory.js
  92. +0 −431 src/urlRouter.js
  93. +211 −0 src/urlRouterProvider.ts
  94. +0 −45 src/view.js
  95. +0 −351 src/viewDirective.js
  96. +0 −52 src/viewScroll.js
  97. +40 −0 src/viewScroll.ts
  98. +128 −40 {lib/angular-1.2.14 → test/angular/1.2}/angular-animate.js
  99. +88 −55 {lib/angular-1.2.14 → test/angular/1.2}/angular-mocks.js
  100. +2,827 −1,726 {lib/angular-1.2.14 → test/angular/1.2}/angular.js
  101. +208 −181 {lib/angular-1.3.0 → test/angular/1.3}/angular-animate.js
  102. +257 −75 {lib/angular-1.3.0 → test/angular/1.3}/angular-mocks.js
  103. +5,326 −4,467 {lib/angular-1.3.0 → test/angular/1.3}/angular.js
  104. 0 {lib/angular-1.4.9 → test/angular/1.4}/angular-animate.js
  105. 0 {lib/angular-1.4.9 → test/angular/1.4}/angular-mocks.js
  106. 0 {lib/angular-1.4.9 → test/angular/1.4}/angular.js
  107. 0 {lib/angular-1.5.0 → test/angular/1.5}/angular-animate.js
  108. 0 {lib/angular-1.5.0 → test/angular/1.5}/angular-mocks.js
  109. 0 {lib/angular-1.5.0 → test/angular/1.5}/angular.js
  110. +4,154 −0 test/angular/1.6/angular-animate.js
  111. +3,404 −0 test/angular/1.6/angular-mocks.js
  112. +32,895 −0 test/angular/1.6/angular.js
  113. +0 −15 test/commonSpec.js
  114. +0 −160 test/compat/matchers.js
  115. +0 −70 test/debug.js
  116. +9 −0 test/index.js
  117. +47 −0 test/ng1StateBuilderSpec.ts
  118. +5 −0 test/noimplicitany.ts
  119. +0 −352 test/resolveSpec.js
  120. +555 −0 test/resolveSpec.ts
  121. +87 −0 test/servicesSpec.ts
  122. +457 −94 test/stateDirectivesSpec.js
  123. +343 −0 test/stateEventsSpec.js
  124. +3 −0 test/stateFiltersSpec.js
  125. +906 −528 test/stateSpec.js
  126. +0 −16 test/templateFactorySpec.js
  127. +86 −0 test/templateFactorySpec.ts
  128. +17 −0 test/tsconfig.json
  129. +325 −220 test/urlMatcherFactorySpec.js
  130. +108 −78 test/{urlRouterSpec.js → urlRouterSpec.ts}
  131. +5 −0 test/util/index.ts
  132. +48 −0 test/util/matchers.ts
  133. +8 −0 test/util/matchers.types.d.ts
  134. +61 −0 test/util/testUtils.ts
  135. +45 −20 test/{testUtils.js → util/testUtilsNg1.ts}
  136. +0 −628 test/viewDirectiveSpec.js
  137. +1,527 −0 test/viewDirectiveSpec.ts
  138. +189 −0 test/viewHookSpec.ts
  139. +3 −0 test/viewScrollSpec.js
  140. +73 −0 test/viewSpec.ts
  141. +20 −0 tsconfig.json
  142. +19 −0 tsconfig.typedoc.json
  143. +60 −0 tslint.json
  144. +53 −0 webpack.config.js
  145. +27 −0 webpack.core-adapter.js
  146. +4,320 −0 yarn.lock
15 changes: 10 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
# master only
build
site

# common
node_modules
bower_components
.DS_Store
*~
**/.*

# webstorm files
.idea
idea-out
*.iml
*.ipr
*.iws

# generated files
_doc
.testlib
lib
lib-esm
release
stats.html
28 changes: 15 additions & 13 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
# Any hidden files
**/.*

# Build related stuff
/build
/config
/lib
/ngdoc_assets
/sample
/test
/bower_components
/node_modules
Gruntfile.js
files.js
node_modules
scripts
src
test
_docs

# Package managers
bower.json
component.json
karma.conf.js
tsconfig.json
tsconfig.**.json
tslint.json
webpack.config.js

*.iml
*.ipr
*.iws
idea-out
49 changes: 44 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,57 @@
language: node_js
node_js:
- "0.10"
- "6.9.2"

#cache:
# directories:
# - $HOME/.npm
# - $HOME/.yarn-cache
# - node_modules

before_install:
- time npm i -g yarn

install:
- time yarn > /dev/null

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install -g karma
- npm install -g grunt-cli
- ./nodeserver.sh > /dev/null &

script:
- grunt integrate
- echo "CORE_BRANCH = x${CORE_BRANCH}x";
# Fetch and build the @uirouter/core branch from github, then install it
- >
if [ "x${CORE_BRANCH}x" != "xx" ] ; then
echo "Installing @uirouter/core from ${CORE_BRANCH}" && \
git clone --depth=10 --branch="${CORE_BRANCH}" https://github.com/ui-router/core.git @uirouter/core && \
pushd @uirouter/core && \
yarn > /dev/null && \
yarn build && \
popd && \
npm install ./@uirouter/core ;
fi
- tsc && npm test

matrix:
allow_failures:
- env: CORE_BRANCH=

env:
matrix:
# CORE_BRANCH env variable specifies the branch of @uirouter/core to use during build/test
# Each CORE_BRANCH listed here will trigger a SEPARATE job in travis
- CORE_BRANCH=master

# If CORE_BRANCH is empty, it will use the @uirouter/core from npm dependencies
# (as specified in package.json)
- CORE_BRANCH=

sudo: false

git:
depth: 10
depth: 3

notifications:
slack: angularbuddies:b6leQM9gkBCW0S7MNDsELpqU
42 changes: 42 additions & 0 deletions .yarnclean
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# test directories
#__tests__
#test
#tests
#powered-test

# asset directories
#docs
#doc
#website
#images
#assets

# examples
#example
#examples

# code coverage directories
#coverage
#.nyc_output

# build scripts
#Makefile
#Gulpfile.js
#Gruntfile.js

# configs
#.tern-project
#.gitattributes
#.editorconfig
#.*ignore
#.eslintrc
#.jshintrc
#.flowconfig
#.documentup.json
#.yarn-metadata.json
#.*.yml
#*.yml

# misc
#*.gz
#*.md
Loading