Skip to content

Commit c533660

Browse files
authored
Merge pull request #289 from OpenF2/1.4.3-wip
Version 1.4.3
2 parents afa451b + e54f20c commit c533660

40 files changed

+9160
-5336
lines changed

F2.latest.js

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

Gruntfile.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ module.exports = function(grunt) {
124124
dist: {
125125
src: [
126126
'sdk/src/template/header.js.tmpl',
127-
'sdk/src/third-party/json2.js',
127+
'sdk/src/third-party/json3.js',
128128
'sdk/src/third-party/jquery.js',
129129
'sdk/src/third-party/jquery.noconflict.js',
130130
'sdk/src/third-party/bootstrap-modal.js',
@@ -146,7 +146,7 @@ module.exports = function(grunt) {
146146
'no-jquery-or-bootstrap': {
147147
src: [
148148
'sdk/src/template/header.js.tmpl',
149-
'sdk/src/third-party/json2.js',
149+
'sdk/src/third-party/json3.js',
150150
'sdk/src/third-party/eventemitter2.js',
151151
'sdk/src/third-party/easyXDM/easyXDM.js',
152152
'<%= jshint.files %>',
@@ -157,7 +157,7 @@ module.exports = function(grunt) {
157157
'no-bootstrap': {
158158
src: [
159159
'sdk/src/template/header.js.tmpl',
160-
'sdk/src/third-party/json2.js',
160+
'sdk/src/third-party/json3.js',
161161
'sdk/src/third-party/jquery.js',
162162
'sdk/src/third-party/jquery.noconflict.js',
163163
'sdk/src/third-party/eventemitter2.js',
@@ -170,7 +170,7 @@ module.exports = function(grunt) {
170170
'no-easyXDM': {
171171
src: [
172172
'sdk/src/template/header.js.tmpl',
173-
'sdk/src/third-party/json2.js',
173+
'sdk/src/third-party/json3.js',
174174
'sdk/src/third-party/jquery.js',
175175
'sdk/src/third-party/bootstrap-modal.js',
176176
'sdk/src/third-party/jquery.noconflict.js',
@@ -183,7 +183,7 @@ module.exports = function(grunt) {
183183
'basic': { //reminiscent of F2 1.0, no secure apps and Container Provide must have jQuery & Bootstrap on page before F2.
184184
src: [
185185
'sdk/src/template/header.js.tmpl',
186-
'sdk/src/third-party/json2.js',
186+
'sdk/src/third-party/json3.js',
187187
'sdk/src/third-party/eventemitter2.js',
188188
'<%= jshint.files %>',
189189
'sdk/src/template/footer.js.tmpl'

dist/f2.basic.js

Lines changed: 886 additions & 454 deletions
Large diffs are not rendered by default.

dist/f2.basic.min.js

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

dist/f2.debug.js

Lines changed: 886 additions & 454 deletions
Large diffs are not rendered by default.

dist/f2.min.js

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

dist/f2.min.map

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

dist/f2.no-bootstrap.js

Lines changed: 886 additions & 454 deletions
Large diffs are not rendered by default.

dist/f2.no-bootstrap.min.js

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

dist/f2.no-easyXDM.js

Lines changed: 886 additions & 454 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)