Skip to content
This repository was archived by the owner on May 4, 2022. It is now read-only.

Commit c7e1f93

Browse files
committed
release: 1.3.3
1 parent 980126d commit c7e1f93

File tree

10 files changed

+32
-34
lines changed

10 files changed

+32
-34
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "ionic-sdk",
33
"private": false,
4-
"version": "1.3.2",
5-
"codename": "france",
4+
"version": "1.3.3",
5+
"codename": "germany",
66
"repository": {
77
"url": "git://github.com/driftyco/ionic.git"
88
},

release/css/ionic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright 2015 Drifty Co.
44
* http://drifty.com/
55
*
6-
* Ionic, v1.3.2
6+
* Ionic, v1.3.3
77
* A powerful HTML5 mobile app framework.
88
* http://ionicframework.com/
99
*

release/css/ionic.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/js/ionic-angular.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2015 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.3.2
5+
* Ionic, v1.3.3
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -902,7 +902,7 @@ function($rootScope, $state, $location, $window, $timeout, $ionicViewSwitcher, $
902902
var viewIds = Object.keys(viewHistory.views);
903903
viewIds.forEach(function(viewId) {
904904
var view = viewHistory.views[viewId];
905-
if ( view.backViewId === switchToView.viewId ) {
905+
if ((view.backViewId === switchToView.viewId) && (view.historyId !== switchToView.historyId)) {
906906
view.backViewId = null;
907907
}
908908
});
@@ -1538,7 +1538,7 @@ function($rootScope, $state, $location, $document, $ionicPlatform, $ionicHistory
15381538
* $ionicConfigProvider.views.maxCache(10);
15391539
* ```
15401540
*
1541-
* Additionally, each platform can have it's own config within the `$ionicConfigProvider.platform`
1541+
* Additionally, each platform can have its own config within the `$ionicConfigProvider.platform`
15421542
* property. The config below would only apply to Android devices.
15431543
*
15441544
* ```js
@@ -10608,7 +10608,7 @@ function headerFooterBarDirective(isHeader) {
1060810608
* reach to trigger the on-infinite expression. Default: 1%.
1060910609
* @param {string=} spinner The {@link ionic.directive:ionSpinner} to show while loading. The SVG
1061010610
* {@link ionic.directive:ionSpinner} is now the default, replacing rotating font icons.
10611-
* @param {string=} icon The icon to show while loading. Default: 'ion-load-d'. This is depreicated
10611+
* @param {string=} icon The icon to show while loading. Default: 'ion-load-d'. This is depreciated
1061210612
* in favor of the SVG {@link ionic.directive:ionSpinner}.
1061310613
* @param {boolean=} immediate-check Whether to check the infinite scroll bounds immediately on load.
1061410614
*
@@ -13296,7 +13296,6 @@ function($animate, $timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $i
1329613296
* @ngdoc directive
1329713297
* @name ionSlides
1329813298
* @module ionic
13299-
* @delegate ionic.service:$ionicSlideBoxDelegate
1330013299
* @restrict E
1330113300
* @description
1330213301
* The Slides component is a powerful multi-page container where each page can be swiped or dragged between.

release/js/ionic-angular.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/js/ionic.bundle.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright 2015 Drifty Co.
1010
* http://drifty.com/
1111
*
12-
* Ionic, v1.3.2
12+
* Ionic, v1.3.3
1313
* A powerful HTML5 mobile app framework.
1414
* http://ionicframework.com/
1515
*
@@ -25,7 +25,7 @@
2525
// build processes may have already created an ionic obj
2626
window.ionic = window.ionic || {};
2727
window.ionic.views = {};
28-
window.ionic.version = '1.3.2';
28+
window.ionic.version = '1.3.3';
2929

3030
(function (ionic) {
3131

@@ -2984,7 +2984,7 @@ function tapMouseDown(e) {
29842984
e.stopPropagation();
29852985

29862986
if (!ionic.Platform.isEdge() && (!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) &&
2987-
!isSelectOrOption(e.target.tagName) && !ionic.tap.isVideo(e.target)) {
2987+
!isSelectOrOption(e.target.tagName) && !e.target.isContentEditable && !ionic.tap.isVideo(e.target)) {
29882988
// If you preventDefault on a text input then you cannot move its text caret/cursor.
29892989
// Allow through only the text input default. However, without preventDefault on an
29902990
// input the 300ms delay can change focus on inputs after the keyboard shows up.
@@ -53185,7 +53185,7 @@ angular.module('ui.router.state')
5318553185
* Copyright 2015 Drifty Co.
5318653186
* http://drifty.com/
5318753187
*
53188-
* Ionic, v1.3.2
53188+
* Ionic, v1.3.3
5318953189
* A powerful HTML5 mobile app framework.
5319053190
* http://ionicframework.com/
5319153191
*
@@ -54085,7 +54085,7 @@ function($rootScope, $state, $location, $window, $timeout, $ionicViewSwitcher, $
5408554085
var viewIds = Object.keys(viewHistory.views);
5408654086
viewIds.forEach(function(viewId) {
5408754087
var view = viewHistory.views[viewId];
54088-
if ( view.backViewId === switchToView.viewId ) {
54088+
if ((view.backViewId === switchToView.viewId) && (view.historyId !== switchToView.historyId)) {
5408954089
view.backViewId = null;
5409054090
}
5409154091
});
@@ -54721,7 +54721,7 @@ function($rootScope, $state, $location, $document, $ionicPlatform, $ionicHistory
5472154721
* $ionicConfigProvider.views.maxCache(10);
5472254722
* ```
5472354723
*
54724-
* Additionally, each platform can have it's own config within the `$ionicConfigProvider.platform`
54724+
* Additionally, each platform can have its own config within the `$ionicConfigProvider.platform`
5472554725
* property. The config below would only apply to Android devices.
5472654726
*
5472754727
* ```js
@@ -63791,7 +63791,7 @@ function headerFooterBarDirective(isHeader) {
6379163791
* reach to trigger the on-infinite expression. Default: 1%.
6379263792
* @param {string=} spinner The {@link ionic.directive:ionSpinner} to show while loading. The SVG
6379363793
* {@link ionic.directive:ionSpinner} is now the default, replacing rotating font icons.
63794-
* @param {string=} icon The icon to show while loading. Default: 'ion-load-d'. This is depreicated
63794+
* @param {string=} icon The icon to show while loading. Default: 'ion-load-d'. This is depreciated
6379563795
* in favor of the SVG {@link ionic.directive:ionSpinner}.
6379663796
* @param {boolean=} immediate-check Whether to check the infinite scroll bounds immediately on load.
6379763797
*
@@ -66479,7 +66479,6 @@ function($animate, $timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $i
6647966479
* @ngdoc directive
6648066480
* @name ionSlides
6648166481
* @module ionic
66482-
* @delegate ionic.service:$ionicSlideBoxDelegate
6648366482
* @restrict E
6648466483
* @description
6648566484
* The Slides component is a powerful multi-page container where each page can be swiped or dragged between.

release/js/ionic.bundle.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/js/ionic.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright 2015 Drifty Co.
33
* http://drifty.com/
44
*
5-
* Ionic, v1.3.2
5+
* Ionic, v1.3.3
66
* A powerful HTML5 mobile app framework.
77
* http://ionicframework.com/
88
*
@@ -18,7 +18,7 @@
1818
// build processes may have already created an ionic obj
1919
window.ionic = window.ionic || {};
2020
window.ionic.views = {};
21-
window.ionic.version = '1.3.2';
21+
window.ionic.version = '1.3.3';
2222

2323
(function (ionic) {
2424

@@ -2977,7 +2977,7 @@ function tapMouseDown(e) {
29772977
e.stopPropagation();
29782978

29792979
if (!ionic.Platform.isEdge() && (!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) &&
2980-
!isSelectOrOption(e.target.tagName) && !ionic.tap.isVideo(e.target)) {
2980+
!isSelectOrOption(e.target.tagName) && !e.target.isContentEditable && !ionic.tap.isVideo(e.target)) {
29812981
// If you preventDefault on a text input then you cannot move its text caret/cursor.
29822982
// Allow through only the text input default. However, without preventDefault on an
29832983
// input the 300ms delay can change focus on inputs after the keyboard shows up.

release/js/ionic.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/version.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.3.2",
3-
"codename": "france",
4-
"date": "2016-10-24",
5-
"time": "20:36:25"
2+
"version": "1.3.3",
3+
"codename": "germany",
4+
"date": "2017-02-22",
5+
"time": "20:52:24"
66
}

0 commit comments

Comments
 (0)