Merge branch 'master' into production

nhn · Jan 11, 2018 · 59090ee · 59090ee
2 parents 5a1db95 + a68292a
commit 59090ee
Show file tree

Hide file tree

Showing 12 changed files with 623 additions and 678 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 
 The MIT License
 
-Copyright (c) 2017 NHN Entertainment Corp.
+Copyright (c) 2018 NHN Entertainment Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -18,22 +18,22 @@ Canvas image editor
 * Image Filter
 
 ## Documentation
-* API: [https://nhnent.github.io/tui.image-editor/latest/](https://nhnent.github.io/tui.image-editor/latest/)
-* Tutorial: [https://github.com/nhnent/tui.image-editor/wiki/Tutorial](https://github.com/nhnent/tui.image-editor/wiki/Tutorial)
-* Examples: [https://nhnent.github.io/tui.image-editor/latest/tutorial-example01-basic.html](https://nhnent.github.io/tui.image-editor/latest/tutorial-example01-basic.html)
+* **API** : [https://nhnent.github.io/tui.image-editor/latest/](https://nhnent.github.io/tui.image-editor/latest/)
+* **Tutorial** : [https://github.com/nhnent/tui.image-editor/wiki/Tutorial](https://github.com/nhnent/tui.image-editor/wiki/Tutorial)
+* **Example** : [https://nhnent.github.io/tui.image-editor/latest/tutorial-example01-basic.html](https://nhnent.github.io/tui.image-editor/latest/tutorial-example01-basic.html)
 
 ## Dependency
-* [fabric.js: ~1.6.7](https://github.com/kangax/fabric.js/releases/tag/v1.6.7)
-* [tui.code-snippet: 1.2.5](https://github.com/nhnent/tui.code-snippet/releases/tag/v1.2.5)
+* [fabric.js](https://github.com/kangax/fabric.js/releases/tag/v1.6.7) >=1.6.7
+* [tui.code-snippet](https://github.com/nhnent/tui.code-snippet/releases/tag/v1.2.5) >=1.2.5
 
-## Tested Browsers
-* Browser:
- * IE9 ~ IE11
+## Test Environment
+### PC
+ * IE9~11
  * Edge
  * Chrome
  * Firefox
  * Safari
-* Mobile test environment
+### Mobile
  * iOS 9.3.x
  * Android 4.4.x
 

diff --git a/examples/css/colorpicker.min.css b/examples/css/colorpicker.min.css
diff --git a/examples/css/tui-image-editor.css → examples/css/service-basic.css b/examples/css/tui-image-editor.css → examples/css/service-basic.css
diff --git a/examples/css/tui-image-editor-m.css → examples/css/service-mobile.css b/examples/css/tui-image-editor-m.css → examples/css/service-mobile.css
diff --git a/examples/example01-basic.html b/examples/example01-basic.html
@@ -2,9 +2,9 @@
 <html>
  <head>
  <meta charset="UTF-8">
- <title>Image editor basic</title>
- <link type="text/css" href="css/colorpicker.min.css" rel="stylesheet">
- <link type="text/css" href="css/tui-image-editor.css" rel="stylesheet">
+ <title>1. Basic</title>
+ <link type="text/css" href="https://cdn.rawgit.com/nhnent/tui.color-picker/v2.0.0/dist/tui-color-picker.css" rel="stylesheet">
+ <link type="text/css" href="css/service-basic.css" rel="stylesheet">
  </head>
  <body>
  <div class="body-container">
@@ -228,6 +228,6 @@
  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js"></script>
  <script type="text/javascript" src="https://cdn.rawgit.com/nhnent/tui.component.colorpicker/1.0.2/dist/colorpicker.min.js"></script>
  <script type="text/javascript" src="../dist/tui-image-editor.js"></script>
- <script src="js/basic.js"></script>
+ <script src="js/service-basic.js"></script>
  </body>
 </html>
diff --git a/examples/example02-mobile.html b/examples/example02-mobile.html
@@ -3,9 +3,9 @@
  <head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, user-scalable=no">
- <title>Image editor mobile</title>
- <link type="text/css" href="css/colorpicker.min.css" rel="stylesheet">
- <link type="text/css" href="css/tui-image-editor-m.css" rel="stylesheet">
+ <title>2. Mobile</title>
+ <link type="text/css" href="https://cdn.rawgit.com/nhnent/tui.color-picker/v2.0.0/dist/tui-color-picker.css" rel="stylesheet">
+ <link type="text/css" href="css/service-mobile.css" rel="stylesheet">
  </head>
  <body>
  <!-- Image editor controls - top area -->
@@ -177,6 +177,6 @@
  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js"></script>
  <script type="text/javascript" src="https://cdn.rawgit.com/nhnent/tui.component.colorpicker/1.0.2/dist/colorpicker.min.js"></script>
  <script type="text/javascript" src="../dist/tui-image-editor.js"></script>
- <script src="js/mobile.js"></script>
+ <script src="js/service-mobile.js"></script>
  </body>
 </html>
diff --git a/examples/examples.json b/examples/examples.json
@@ -1,8 +1,8 @@
 {
  "example01-basic": {
- "title": "Basic Example"
+ "title": "1. Basic"
  },
  "example02-mobile": {
- "title": "Mobile Example"
+ "title": "2. Mobile"
  }
 }
diff --git a/examples/js/basic.js → examples/js/service-basic.js b/examples/js/basic.js → examples/js/service-basic.js
diff --git a/examples/js/mobile.js → examples/js/service-mobile.js b/examples/js/mobile.js → examples/js/service-mobile.js
diff --git a/karma.conf.js b/karma.conf.js
@@ -55,8 +55,8 @@ function setConfig(defaultConfig, server) {
  'IE11',
  'Edge',
  'Chrome-WebDriver',
- 'Firefox-WebDriver',
- 'Safari-WebDriver'
+ 'Firefox-WebDriver'
+ // 'Safari-WebDriver'
  ];
  defaultConfig.reporters.push('coverage');
  defaultConfig.reporters.push('junit');
@@ -79,7 +79,7 @@ function setConfig(defaultConfig, server) {
  ]
  };
  defaultConfig.junitReporter = {
- outputDir: 'report',
+ outputDir: 'report/junit',
  suite: ''
  };
  } else {