Merge remote-tracking branch 'gitbrent/master' into fork-sync

gitbrent · Sep 28, 2017 · 2993ba0 · 2993ba0
2 parents 428f44d + f95fe01
commit 2993ba0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - New chart option: show Data Table [\#182](https://github.com/gitbrent/PptxGenJS/issues/182) ([akashkarpe](https://github.com/akashkarpe))
 - New chart option: catAxisLabelFrequency [\#184](https://github.com/gitbrent/PptxGenJS/pull/184) ([kajda90](https://github.com/kajda90))
 - New chart type: XY Scatter [\#192](https://github.com/gitbrent/PptxGenJS/issues/192) ([shaunvdp](https://github.com/shaunvdp))
+- Add electron detection to load correct jquery version [\#200](https://github.com/gitbrent/PptxGenJS/issues/200) ([mreilaender](https://github.com/mreilaender))
 
 
 

diff --git a/README.md b/README.md
@@ -134,6 +134,7 @@ npm install pptxgenjs
 
 var pptx = require("pptxgenjs");
 ```
+* Desktop: Compatible with Electron applications!
 
 **************************************************************************************************
 # Presentations: Usage and Options

diff --git a/dist/pptxgen.bundle.js b/dist/pptxgen.bundle.js
diff --git a/dist/pptxgen.bundle.js.map b/dist/pptxgen.bundle.js.map
diff --git a/dist/pptxgen.js b/dist/pptxgen.js
@@ -64,7 +64,7 @@ if ( NODEJS ) {
 var PptxGenJS = function(){
 	// APP
 	var APP_VER = "1.9.0-beta";
-	var APP_REL = "20170926";
+	var APP_REL = "20170927";
 
 	// CONSTANTS
 	var MASTER_OBJECTS = {
@@ -4733,12 +4733,15 @@ var PptxGenJS = function(){
 
 // [Node.js] support
 if ( NODEJS ) {
-	// A: Load depdendencies
+	// A: Set vars
+	var isElectron = require("is-electron");
+
+	// B: Load depdendencies
 	var fs = require("fs");
-	var $ = require("jquery-node");
+	var $ = isElectron() ? require("jquery") : require("jquery-node");
 	var JSZip = require("jszip");
 	var sizeOf = require("image-size");
 
-	// B: Export module
+	// C: Export module
 	module.exports = new PptxGenJS();
 }
diff --git a/package.json b/package.json
@@ -12,6 +12,8 @@
 	"dependencies": {
 		"express": "^4.15.3",
 		"image-size": ">=0.5.1",
+		"is-electron": "^2.1.0",
+		"jquery": "^3.2.1",
 		"jquery-node": "^0.3.0",
 		"jszip": ">=3.1.2"
 	},