Skip to content
This repository was archived by the owner on Jul 2, 2020. It is now read-only.

Commit 580cd64

Browse files
author
oraclejet
committed
Release 1.1.0
1 parent ba0d1cd commit 580cd64

File tree

23 files changed

+129
-466
lines changed

23 files changed

+129
-466
lines changed

‎common/index.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,20 @@ module.exports =
154154
}
155155
resolve(generator);
156156
});
157+
},
158+
159+
fsExistsSync: function(path)
160+
{
161+
try
162+
{
163+
fs.statSync(path);
164+
return true;
165+
}
166+
catch (err)
167+
{
168+
// file/directory does not exist
169+
return false;
170+
}
157171
}
158172
};
159173

‎common/template/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var _WEB = "web";
1515

1616
var BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
1717

18-
var _TEMPLATES_NPM_URL = "oraclejet-templates@2.1.0-b1";
18+
var _TEMPLATES_NPM_URL = "oraclejet-templates@2.1.0";
1919

2020
var _TEMPLATES = [BLANK_TEMPLATE, 'basic', 'navbar', 'navdrawer'];
2121

‎generators/add-hybrid/index.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ var OracleJetAddHybridGenerator = generators.Base.extend(
6868

6969
_createExtraSrcDirs(this)
7070
.then(cordovaHelper.create.bind(this))
71+
.then(commonHybrid.copyHooks.bind(this))
7172
.then(commonHybrid.copyResources.bind(this))
7273
.then(commonHybrid.removeExtraCordovaFiles.bind(this))
73-
// TODO: need to figure out what to do with hooks here
74-
// .then(commonHybrid.writeCordovaHookScripts.bind(this))
75-
.then(commonHybrid.updateConfigXml.bind(this))
7674
.then(platformsHelper.addPlatforms.bind(this))
75+
.then(commonHybrid.updateConfigXml.bind(this))
7776
.then(function()
7877
{
7978
done();
@@ -149,4 +148,4 @@ function _validateHybridDirDoesNotExist(generator)
149148
// hybrid dir does not exist, OK to proceed
150149
}
151150
return Promise.resolve(generator);
152-
}
151+
}

‎generators/app/templates/blank/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<meta name="apple-mobile-web-app-title" content="Oracle JET">
3333

3434
<!-- injector:theme -->
35-
<link rel="stylesheet" href="css/libs/oj/v2.1.0-b1/alta/oj-alta-min.css" id="css" />
35+
<link rel="stylesheet" href="css/libs/oj/v2.1.0/alta/oj-alta-min.css" id="css" />
3636
<!-- endinjector -->
3737

3838
<!-- This is where you would add any app specific styling -->

‎generators/app/templates/blank/js/main-release-paths.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"promise": "libs/es6-promise/es6-promise.min",
66
"hammerjs": "libs/hammer/hammer-2.0.8.min",
77
"ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
8-
"ojs": "libs/oj/v2.1.0-b1/min",
9-
"ojL10n": "libs/oj/v2.1.0-b1/ojL10n",
10-
"ojtranslations": "libs/oj/v2.1.0-b1/resources",
8+
"ojs": "libs/oj/v2.1.0/min",
9+
"ojL10n": "libs/oj/v2.1.0/ojL10n",
10+
"ojtranslations": "libs/oj/v2.1.0/resources",
1111
"text": "libs/require/text",
1212
"signals": "libs/js-signals/signals.min"
1313
}

‎generators/app/templates/blank/js/main.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ requirejs.config(
2626
'promise': 'libs/es6-promise/es6-promise',
2727
'hammerjs': 'libs/hammer/hammer-2.0.8',
2828
'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.0',
29-
'ojs': 'libs/oj/v2.1.0-b1/debug',
30-
'ojL10n': 'libs/oj/v2.1.0-b1/ojL10n',
31-
'ojtranslations': 'libs/oj/v2.1.0-b1/resources',
29+
'ojs': 'libs/oj/v2.1.0/debug',
30+
'ojL10n': 'libs/oj/v2.1.0/ojL10n',
31+
'ojtranslations': 'libs/oj/v2.1.0/resources',
3232
'text': 'libs/require/text',
3333
'signals': 'libs/js-signals/signals'
3434
}

‎generators/app/templates/common/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"dependencies":
55
{
6-
"oraclejet": "2.1.0-b1"
6+
"oraclejet": "2.1.0"
77
}
88
}

‎generators/app/templates/common/package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
"version": "1.0.0",
44
"description": "A sample Oracle JavaScript Extension Toolkit (JET) web app",
55
"author": {
6-
"name": "Oracle Jet Team",
7-
"email": "oraclejet_interest_ww_grp@oracle.com",
8-
"homepage": "http://jet.us.oracle.com"
6+
"name": "Oracle Jet Team"
97
},
108
"devDependencies": {
119
"grunt": "^1.0.1",
1210
"grunt-bowercopy": "1.2.4",
13-
"grunt-oraclejet": "1.1.0-b3",
11+
"grunt-oraclejet": "~1.1.0",
1412
"load-grunt-config": "0.19.2",
15-
"oraclejet-tooling": "1.1.0-b3"
13+
"oraclejet-tooling": "~1.1.0"
1614
},
1715
"engines": {
1816
"node": ">=0.10.0"

‎generators/app/templates/common/scripts/grunt/config/bowercopy.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,17 @@ module.exports = function(grunt)
105105
}
106106
},
107107

108+
oraclejetNlsRootResources:
109+
{
110+
options:
111+
{
112+
srcPrefix: "bower_components/oraclejet/dist/js/libs/oj/resources/nls",
113+
destPrefix: "src/js/libs/oj/v<%= grunt.config.data.bowercopy.options.versions.jetVersion %>/resources/root"
114+
},
115+
116+
src: '*.js'
117+
},
118+
108119
// place in the same directory as jet's demo app
109120
thirdParty:
110121
{

‎generators/hybrid/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ var OracleJetHybridCreateGenerator = generators.Base.extend({
9191
.then(cordovaHelper.create)
9292
.then(commonHybrid.copyResources.bind(this))
9393
.then(commonHybrid.removeExtraCordovaFiles.bind(this))
94-
.then(commonHybrid.writeCordovaHookScripts.bind(this))
95-
.then(commonHybrid.updateConfigXml.bind(this))
9694
.then(platformsHelper.addPlatforms.bind(this))
95+
.then(commonHybrid.updateConfigXml.bind(this))
9796
.then(function()
9897
{
9998
done();

0 commit comments

Comments
 (0)