Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b9ade09

Browse files
committed
feat: update AngularJS to 1.5.11
- switch to NPM and remove Bower - this meant downgrading from ionic SDK 1.3.5 to 1.3.2 as Bower has 1.3.5 and NPM only has 1.3.2 - add script for copying libraries from `node_modules/` to `www/lib`
1 parent e290bb2 commit b9ade09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+42388
-75844
lines changed

‎.bowerrc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎bower.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version='1.0' encoding='utf-8'?>
22
<widget id="dev.xlts.angularjs.ionic" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
3-
<name>MyApp</name>
4-
<description>An awesome Ionic/Cordova app.</description>
5-
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
3+
<name>Ionic AngularJS</name>
4+
<description>An Ionic v1 app running with XLTS for AngularJS.</description>
5+
<author email="support@xlts.dev" href="https://xlts.dev">XLTS.dev Team</author>
66
<content src="index.html" />
77
<access origin="*" />
88
<allow-intent href="http://*/*" />

‎package-lock.json‎

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

‎package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-ionic-v1",
3-
"version": "0.0.1",
3+
"version": "0.1.0",
44
"description": "Ionic v1 with XLTS for AngularJS",
55
"repository": {
66
"type": "git",
@@ -9,7 +9,6 @@
99
"license": "MIT",
1010
"devDependencies": {
1111
"@ionic/v1-toolkit": "1.0.22",
12-
"bower": "1.8.12",
1312
"cordova-plugin-device": "^2.0.2",
1413
"cordova-plugin-ionic-keyboard": "^2.2.0",
1514
"cordova-plugin-ionic-webview": "^4.2.1",
@@ -23,15 +22,20 @@
2322
"native-run": "^1.4.0"
2423
},
2524
"dependencies": {
25+
"angular": "1.5.11",
26+
"angular-animate": "1.5.11",
27+
"angular-sanitize": "1.5.11",
28+
"angular-ui-router": "0.2.13",
2629
"cordova-android": "9.1.0",
27-
"cordova-ios": "6.2.0"
30+
"cordova-ios": "6.2.0",
31+
"ionic-sdk": "1.3.2"
2832
},
2933
"resolutions": {
3034
"graceful-fs": "^4.2.6"
3135
},
3236
"scripts": {
3337
"preinstall": "npx npm-force-resolutions",
34-
"postinstall": "bower install",
38+
"postinstall": "tools/populate-lib.sh",
3539
"start": "npm run start:web",
3640
"start:web": "ionic serve",
3741
"start:android": "ionic cordova run android -l",

‎tools/populate-lib.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
cp -R node_modules/angular/ www/lib/angular/;
4+
cp -R node_modules/angular-animate/ www/lib/angular-animate/;
5+
cp -R node_modules/angular-sanitize/ www/lib/angular-sanitize/;
6+
cp -R node_modules/angular-ui-router/api/ www/lib/angular-ui-router/api/;
7+
cp -R node_modules/angular-ui-router/release/ www/lib/angular-ui-router/release/;
8+
mkdir -p www/lib/ionic;
9+
cp -R node_modules/ionic-sdk/scss/ www/lib/ionic/scss/;
10+
cp -R node_modules/ionic-sdk/release/css/ www/lib/ionic/css/;
11+
cp -R node_modules/ionic-sdk/release/fonts/ www/lib/ionic/fonts/;
12+
mkdir -p www/lib/ionic/js/;
13+
cp node_modules/ionic-sdk/release/js/ionic.min.js www/lib/ionic/js/;
14+
cp node_modules/ionic-sdk/release/js/ionic.js www/lib/ionic/js/;
15+
cp node_modules/ionic-sdk/release/js/ionic-angular.min.js www/lib/ionic/js/;
16+
cp node_modules/ionic-sdk/release/js/ionic-angular.js www/lib/ionic/js/;

‎www/css/ionic.app.css‎

Lines changed: 14 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $dark: #444 !default;
1919
Ionicons, v2.0.1
2020
Created by Ben Sperry for the Ionic Framework, http://ionicons.com/
2121
https://twitter.com/benjsperry https://twitter.com/ionicframework
22-
MIT License: https://github.com/ionic-team/ionicons
22+
MIT License: https://github.com/driftyco/ionicons
2323
2424
Android-style icons originally built by Google’s
2525
Material Design Icons: https://github.com/google/material-design-icons
@@ -6604,9 +6604,6 @@ button.item.item-button-right {
66046604
align-items: center; }
66056605
.item-options .button:before {
66066606
margin: 0 auto; }
6607-
.item-options ion-option-button:last-child {
6608-
padding-right: calc(constant(safe-area-inset-right) + 12px);
6609-
padding-right: calc(env(safe-area-inset-right) + 12px); }
66106607

66116608
/**
66126609
* Lists
@@ -9602,57 +9599,28 @@ a.button {
96029599
* Platform specific tweaks
96039600
*/
96049601
.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) {
9605-
height: 64px;
9606-
height: calc(constant(safe-area-inset-top) + 44px);
9607-
height: calc(env(safe-area-inset-top) + 44px); }
9602+
height: 64px; }
96089603
.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader).item-input-inset .item-input-wrapper {
96099604
margin-top: 19px !important; }
96109605
.platform-ios.platform-cordova:not(.fullscreen) .bar-header:not(.bar-subheader) > * {
9611-
margin-top: 20px;
9612-
margin-top: constant(safe-area-inset-top);
9613-
margin-top: env(safe-area-inset-top); }
9614-
9615-
.platform-ios.platform-cordova:not(.fullscreen) .bar-header {
9616-
padding-left: calc( constant(safe-area-inset-left) + 5px);
9617-
padding-left: calc(env(safe-area-inset-left) + 5px);
9618-
padding-right: calc(constant(safe-area-inset-right) + 5px);
9619-
padding-right: calc(env(safe-area-inset-right) + 5px); }
9620-
.platform-ios.platform-cordova:not(.fullscreen) .bar-header .buttons:last-child {
9621-
right: calc(constant(safe-area-inset-right) + 5px);
9622-
right: calc(env(safe-area-inset-right) + 5px); }
9623-
9624-
.platform-ios.platform-cordova:not(.fullscreen) .has-tabs, .platform-ios.platform-cordova:not(.fullscreen) .bar-footer.has-tabs {
9625-
bottom: calc(constant(safe-area-inset-bottom) + 49px);
9626-
bottom: calc(env(safe-area-inset-bottom) + 49px); }
9627-
9628-
.platform-ios.platform-cordova:not(.fullscreen) .tabs-top > .tabs, .platform-ios.platform-cordova:not(.fullscreen) .tabs.tabs-top {
9629-
top: 64px; }
9606+
margin-top: 20px; }
96309607

9631-
.platform-ios.platform-cordova:not(.fullscreen) .tabs {
9632-
padding-bottom: constant(safe-area-inset-bottom);
9633-
padding-bottom: env(safe-area-inset-bottom);
9634-
height: calc(constant(safe-area-inset-bottom) + 49px);
9635-
height: calc(env(safe-area-inset-bottom) + 49px); }
9608+
.platform-ios.platform-cordova:not(.fullscreen) .tabs-top > .tabs,
9609+
.platform-ios.platform-cordova:not(.fullscreen) .tabs.tabs-top {
9610+
top: 64px; }
96369611

9637-
.platform-ios.platform-cordova:not(.fullscreen) .has-header, .platform-ios.platform-cordova:not(.fullscreen) .bar-subheader {
9638-
top: 64px;
9639-
top: calc(constant(safe-area-inset-top) + 44px);
9640-
top: calc(env(safe-area-inset-top) + 44px); }
9612+
.platform-ios.platform-cordova:not(.fullscreen) .has-header,
9613+
.platform-ios.platform-cordova:not(.fullscreen) .bar-subheader {
9614+
top: 64px; }
96419615

96429616
.platform-ios.platform-cordova:not(.fullscreen) .has-subheader {
9643-
top: 108px;
9644-
top: calc(constant(safe-area-inset-top) + 88px);
9645-
top: calc(env(safe-area-inset-top) + 88px); }
9617+
top: 108px; }
96469618

96479619
.platform-ios.platform-cordova:not(.fullscreen) .has-header.has-tabs-top {
9648-
top: 113px;
9649-
top: calc(93px + constant(safe-area-inset-top));
9650-
top: calc(93px + env(safe-area-inset-top)); }
9620+
top: 113px; }
96519621

96529622
.platform-ios.platform-cordova:not(.fullscreen) .has-header.has-subheader.has-tabs-top {
9653-
top: 157px;
9654-
top: calc(137px + constant(safe-area-inset-right));
9655-
top: calc(137px + env(safe-area-inset-right)); }
9623+
top: 157px; }
96569624

96579625
.platform-ios.platform-cordova .popover .bar-header:not(.bar-subheader) {
96589626
height: 44px; }
@@ -9661,7 +9629,8 @@ a.button {
96619629
.platform-ios.platform-cordova .popover .bar-header:not(.bar-subheader) > * {
96629630
margin-top: 0; }
96639631

9664-
.platform-ios.platform-cordova .popover .has-header, .platform-ios.platform-cordova .popover .bar-subheader {
9632+
.platform-ios.platform-cordova .popover .has-header,
9633+
.platform-ios.platform-cordova .popover .bar-subheader {
96659634
top: 44px; }
96669635

96679636
.platform-ios.platform-cordova .popover .has-subheader {
@@ -9671,34 +9640,6 @@ a.button {
96719640
margin-bottom: 20px; }
96729641

96739642
@media (orientation: landscape) {
9674-
.item {
9675-
padding: 16px calc(constant(safe-area-inset-right) + 16px); }
9676-
.item .badge {
9677-
right: calc(constant(safe-area-inset-right) + 32px); }
9678-
.item-icon-left {
9679-
padding-left: calc(constant(safe-area-inset-left) + 54px); }
9680-
.item-icon-left .icon {
9681-
left: calc(constant(safe-area-inset-left) + 11px); }
9682-
.item-icon-right {
9683-
padding-right: calc(constant(safe-area-inset-right) + 54px); }
9684-
.item-icon-right .icon {
9685-
right: calc(constant(safe-area-inset-right) + 11px); }
9686-
.item-complex,
9687-
a.item.item-complex,
9688-
button.item.item-complex {
9689-
padding: 0; }
9690-
.item-complex .item-content, a.item.item-complex .item-content, button.item.item-complex .item-content {
9691-
padding: 16px calc(constant(safe-area-inset-right) + 49px) 16px calc(constant(safe-area-inset-left) + 16px); }
9692-
.item-left-edit.visible.active {
9693-
-webkit-transform: translate3d(calc(constant(safe-area-inset-left) + 8px), 0, 0);
9694-
transform: translate3d(calc(constant(safe-area-inset-left) + 8px), 0, 0); }
9695-
.list-left-editing .item-left-editable .item-content,
9696-
.item-left-editing.item-left-editable .item-content {
9697-
-webkit-transform: translate3d(calc(constant(safe-area-inset-left) + 50px), 0, 0);
9698-
transform: translate3d(calc(constant(safe-area-inset-left) + 50px), 0, 0); }
9699-
.item-right-edit {
9700-
right: constant(safe-area-inset-right);
9701-
right: env(safe-area-inset-right); }
97029643
.platform-ios.platform-browser.platform-ipad {
97039644
position: fixed; } }
97049645

‎www/css/ionic.app.min.css‎

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

‎www/index.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
.catch(err => console.log('Error', err));
1616
}
1717
</script>-->
18-
19-
<link href="lib/ionic/css/ionic.css" rel="stylesheet">
20-
<link href="css/style.css" rel="stylesheet">
21-
22-
<!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
2318
<link href="css/ionic.app.css" rel="stylesheet">
24-
-->
2519

2620
<!-- ionic/angularjs js -->
27-
<script src="lib/ionic/js/ionic.bundle.js"></script>
21+
<script src="lib/angular/angular.js"></script>
22+
<script src="lib/angular-animate/angular-animate.js"></script>
23+
<script src="lib/angular-sanitize/angular-sanitize.js"></script>
24+
<script src="lib/angular-ui-router/release/angular-ui-router.js"></script>
25+
<script src="lib/ionic/js/ionic.js"></script>
26+
<script src="lib/ionic/js/ionic-angular.js"></script>
2827

2928
<!-- cordova script (this will be a 404 during development) -->
3029
<script src="cordova.js"></script>

‎www/lib/angular-animate/.bower.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /