Merge pull request #2 from xsolla/dev

Dev
xsolla · Feb 13, 2017 · 54e3624 · 54e3624
2 parents 2088511 + 60732d9
commit 54e3624
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,19 +42,7 @@ jspm_packages
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
+.idea/
 
 # Gradle:
 .idea/gradle.xml

diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/xsolla-login-lib.iml b/.idea/xsolla-login-lib.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1 - 2017-02-13
+
+- [fix] Compatibility with IE 11
+
 ## 1.1.0 - 2017-02-09
 
 - [feature] Event handler after widget was loaded

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ To use the SDK in the browser, simply add the following script tag to your
 HTML pages:
 
 ```html
-<script src="https://static.xsolla.com/xsolla-login/1.1.0/xl.min.js"></script>
+<script src="https://static.xsolla.com/xsolla-login/1.1.1/xl.min.js"></script>
 ```
 ### Using Bower
 
@@ -50,6 +50,37 @@ SDK supports two types of integration:
 1. API call integration
 
 You can mix intefration types within project.
+
+### Authentication widget 
+You can add a standard authentication widget using the example below. The layout can be customized using CSS. 
+The default block width is 400 px; the height depends on the authentication options.
+
+To add an Xsolla Login widget to your game:
+1. Enable js-sdk.js in the `<head>` tag: 
+1. Add the initialization code in the `<body>` tag: 
+
+```html
+     <script type="text/javascript">
+     XL.init({
+             projectId: '40db2ea4-5p47-11e6-a3ff-005056a0e04a',
+             locale: 'en_US',
+             onlyWidgets: true,
+             redirectUrl: '<your redirect url>',
+             fields: 'email'
+         });
+     </script>
+
+     <div id="xl_auth"></div>
+     <script type="text/javascript">
+     var element_id = 'xl_auth';
+     var options = {
+         width: '200px',
+         height: '200px'
+     };
+     XL.AuthWidget(element_id, options);
+     </script>
+```
+
 ### Markup Integration
 You can integrate Xsolla Login simply mark your code html controls with `data-xl-auth=""` attribute so SDK automatically applies appropriate `onclick` handler.
 

diff --git a/dist/xl.js b/dist/xl.js
diff --git a/dist/xl.min.js b/dist/xl.min.js
diff --git a/dist/xl.min.js.map b/dist/xl.min.js.map
diff --git a/gulpfile.js b/gulpfile.js
@@ -27,7 +27,7 @@ function setupBrowserify(watch) {
         standalone: 'XL',
         fullPaths: false,
         debug: true,
-        transform: [["babelify", { "presets": ["es2015"] }]]
+        transform: [["babelify", { "presets": ["es2015"], "plugins": ["transform-object-assign"] }]]
     };
     var bundler = browserify('./src/main.js', bundleOptions);
     bundler.require('./src/main.js', {entry: true, expose: 'main'});

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xsolla-login-lib",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "main": "src/main.js",
   "scripts": {
@@ -13,6 +13,7 @@
     "winchan": "^0.1.2"
   },
   "devDependencies": {
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-es2015": "^6.18.0",
     "babelify": "^7.3.0",
     "bower": "1.4.1",