set major and minor platform versions in body css

Adam Bradley · Adam Bradley · commit 7352be90102b · 2014-01-31T20:57:26.000-06:00
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
@@ -2762,6 +2762,10 @@ angular.module('ionic.ui.viewState', ['ionic.service.view', 'ionic.service.gestu
         updateHeaderData(data);
       });
 
+      $rootScope.$on('viewState.titleUpdated', function(e, data) {
+        $scope.currentTitle = (data && data.title ? data.title : '');
+      });
+
       // If a nav page changes the left or right buttons, update our scope vars
       $scope.$parent.$on('viewState.leftButtonsChanged', function(e, data) {
         $scope.leftButtons = data;
@@ -2823,10 +2827,16 @@ angular.module('ionic.ui.viewState', ['ionic.service.view', 'ionic.service.gestu
           $scope.$emit('viewState.rightButtonsChanged', $scope.rightButtons);
         });
 
+        // watch for changes in the title
+        var deregTitle = $scope.$watch('title', function(val) {
+          $scope.$emit('viewState.titleUpdated', $scope);
+        });
+
         $scope.$on('$destroy', function(){
           // deregister on destroy
           deregLeftButtons();
           deregRightButtons();
+          deregTitle();
         });
 
       };
diff --git a/dist/js/ionic-angular.min.js b/dist/js/ionic-angular.min.js
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
@@ -1794,20 +1794,23 @@ window.ionic = {
 
     _checkPlatforms: function(platforms) {
       this.platforms = [];
+      var v = this.version().toString().replace('.', '_');
 
       if(this.isCordova()) {
         this.platforms.push('cordova');
       }
       if(this.isIOS()) {
         this.platforms.push('ios');
-        this.platforms.push('ios' + parseInt(this.version(), 10));
+        this.platforms.push('ios' + v.split('_')[0]);
+        this.platforms.push('ios' + v);
       }
       if(this.isIPad()) {
         this.platforms.push('ipad');
       }
       if(this.isAndroid()) {
         this.platforms.push('android');
-        this.platforms.push('android' + parseInt(this.version(), 10));
+        this.platforms.push('android' + v.split('_')[0]);
+        this.platforms.push('android' + v);
       }
     },
 
diff --git a/dist/js/ionic.min.js b/dist/js/ionic.min.js
diff --git a/js/ext/angular/test/service/ionicPlatform.unit.js b/js/ext/angular/test/service/ionicPlatform.unit.js
@@ -35,6 +35,9 @@ describe('Ionic Platform Service', function() {
     ionic.Platform.setVersion(' ');
     expect(ionic.Platform.version()).toEqual(0);
 
+    ionic.Platform.setVersion('me-not-number');
+    expect(ionic.Platform.version()).toEqual(0);
+
     ionic.Platform.setVersion('');
     expect(ionic.Platform.version()).toEqual(0);
 
@@ -89,18 +92,20 @@ describe('Ionic Platform Service', function() {
     expect(ionic.Platform.platforms[0]).toEqual('cordova');
     expect(ionic.Platform.platforms[1]).toEqual('ios');
     expect(ionic.Platform.platforms[2]).toEqual('ios7');
+    expect(ionic.Platform.platforms[3]).toEqual('ios7_9');
   });
 
   it('sets android platforms', function() {
     window.cordova = {};
     ionic.Platform.setPlatform('android');
-    ionic.Platform.setVersion('4.4.4');
+    ionic.Platform.setVersion('4.2.3');
     
     ionic.Platform._checkPlatforms()
 
     expect(ionic.Platform.platforms[0]).toEqual('cordova');
     expect(ionic.Platform.platforms[1]).toEqual('android');
     expect(ionic.Platform.platforms[2]).toEqual('android4');
+    expect(ionic.Platform.platforms[3]).toEqual('android4_2');
   });
 
   it('is android', function() {
diff --git a/js/utils/platform.js b/js/utils/platform.js
@@ -38,20 +38,23 @@
 
     _checkPlatforms: function(platforms) {
       this.platforms = [];
+      var v = this.version().toString().replace('.', '_');
 
       if(this.isCordova()) {
         this.platforms.push('cordova');
       }
       if(this.isIOS()) {
         this.platforms.push('ios');
-        this.platforms.push('ios' + parseInt(this.version(), 10));
+        this.platforms.push('ios' + v.split('_')[0]);
+        this.platforms.push('ios' + v);
       }
       if(this.isIPad()) {
         this.platforms.push('ipad');
       }
       if(this.isAndroid()) {
         this.platforms.push('android');
-        this.platforms.push('android' + parseInt(this.version(), 10));
+        this.platforms.push('android' + v.split('_')[0]);
+        this.platforms.push('android' + v);
       }
     },
 

Original file line number	Diff line number	Diff line change
`@@ -1794,20 +1794,23 @@ window.ionic = {`
`1794`	`1794`
`1795`	`1795`	`_checkPlatforms: function(platforms) {`
`1796`	`1796`	`this.platforms = [];`
	`1797`	`+ var v = this.version().toString().replace('.', '_');`
`1797`	`1798`
`1798`	`1799`	`if(this.isCordova()) {`
`1799`	`1800`	`this.platforms.push('cordova');`
`1800`	`1801`	`}`
`1801`	`1802`	`if(this.isIOS()) {`
`1802`	`1803`	`this.platforms.push('ios');`
`1803`		`- this.platforms.push('ios' + parseInt(this.version(), 10));`
	`1804`	`+ this.platforms.push('ios' + v.split('_')[0]);`
	`1805`	`+ this.platforms.push('ios' + v);`
`1804`	`1806`	`}`
`1805`	`1807`	`if(this.isIPad()) {`
`1806`	`1808`	`this.platforms.push('ipad');`
`1807`	`1809`	`}`
`1808`	`1810`	`if(this.isAndroid()) {`
`1809`	`1811`	`this.platforms.push('android');`
`1810`		`- this.platforms.push('android' + parseInt(this.version(), 10));`
	`1812`	`+ this.platforms.push('android' + v.split('_')[0]);`
	`1813`	`+ this.platforms.push('android' + v);`
`1811`	`1814`	`}`
`1812`	`1815`	`},`
`1813`	`1816`
Original file line number	Diff line number	Diff line change
`@@ -38,20 +38,23 @@`
`38`	`38`
`39`	`39`	`_checkPlatforms: function(platforms) {`
`40`	`40`	`this.platforms = [];`
	`41`	`+ var v = this.version().toString().replace('.', '_');`
`41`	`42`
`42`	`43`	`if(this.isCordova()) {`
`43`	`44`	`this.platforms.push('cordova');`
`44`	`45`	`}`
`45`	`46`	`if(this.isIOS()) {`
`46`	`47`	`this.platforms.push('ios');`
`47`		`- this.platforms.push('ios' + parseInt(this.version(), 10));`
	`48`	`+ this.platforms.push('ios' + v.split('_')[0]);`
	`49`	`+ this.platforms.push('ios' + v);`
`48`	`50`	`}`
`49`	`51`	`if(this.isIPad()) {`
`50`	`52`	`this.platforms.push('ipad');`
`51`	`53`	`}`
`52`	`54`	`if(this.isAndroid()) {`
`53`	`55`	`this.platforms.push('android');`
`54`		`- this.platforms.push('android' + parseInt(this.version(), 10));`
	`56`	`+ this.platforms.push('android' + v.split('_')[0]);`
	`57`	`+ this.platforms.push('android' + v);`
`55`	`58`	`}`
`56`	`59`	`},`
`57`	`60`