Merge branch 'master' into production

Author: heenakwag

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2018 NHN Entertainment Corp.
+Copyright (c) 2018 NHN 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

README.md

@@ -4,7 +4,7 @@
 
 It includes several features like `class simulation`, `browser detecting`, `type checking` and +30 more.
 
-`tui-code-snippet` supports IE8+ and modern browsers and already has been used for [open source javascript components](http://github.com/nhnent/) and many commercial projects in [NHN](http://www.nhn.com) corporation.
+`tui-code-snippet` supports IE8+ and modern browsers and already has been used for [open source javascript components](http://github.com/nhn/) and many commercial projects in [NHN](http://www.nhn.com) corporation.
 
 ## Feature
 * browser.js
@@ -50,8 +50,8 @@ It includes several features like `class simulation`, `browser detecting`, `type
  * Support utils to define modules
 
 ## Documentation
-* API: [https://nhnent.github.io/tui.code-snippet/latest/](https://nhnent.github.io/tui.code-snippet/latest/)
-* Tutorial: [https://github.com/nhnent/fe.javascript/wiki/Toast-UI-CodeSnippet](https://github.com/nhnent/fe.javascript/wiki/Toast-UI-CodeSnippet)
+* API: [https://nhn.github.io/tui.code-snippet/latest/](https://nhn.github.io/tui.code-snippet/latest/)
+* Tutorial: [https://github.com/nhn/fe.javascript/wiki/Toast-UI-CodeSnippet](https://github.com/nhn/fe.javascript/wiki/Toast-UI-CodeSnippet)
 
 ## Tested Browsers
 * browser:
@@ -102,8 +102,8 @@ var util = tui.util;
 ```
 
 ### Download
-* [Download bundle files from `dist` folder](https://github.com/nhnent/tui.code-snippet/tree/production/dist)
-* [Download all sources for each version](https://github.com/nhnent/tui.code-snippet/releases)
+* [Download bundle files from `dist` folder](https://github.com/nhn/tui.code-snippet/tree/production/dist)
+* [Download all sources for each version](https://github.com/nhn/tui.code-snippet/releases)
 
 ## License
-[MIT LICENSE](https://github.com/nhnent/tui.code-snippet/blob/master/LICENSE)
+[MIT LICENSE](https://github.com/nhn/tui.code-snippet/blob/master/LICENSE)

jsdoc.conf.json

@@ -12,7 +12,7 @@
             "url": "https://cloud.githubusercontent.com/assets/12269563/20029815/01133928-a39a-11e6-80f3-12500a91c755.png",
             "width": "150px",
             "height": "13px",
-            "link": "https://github.com/nhnent/tui.jsdoc-template"
+            "link": "https://github.com/nhn/tui.jsdoc-template"
         }
     },
     "opts": {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tui-code-snippet",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "TOAST UI Utility: CodeSnippet",
   "main": "dist/tui-code-snippet.js",
   "scripts": {
@@ -12,15 +12,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/nhnent/tui.code-snippet.git"
+    "url": "https://github.com/nhn/tui.code-snippet.git"
   },
   "keywords": [
     "nhn",
-    "nhnent",
     "tui",
     "utility",
-    "code-snippet",
-    "nhn"
+    "code-snippet"
   ],
   "author": "NHN. FE Development Lab <dl_javascript@nhn.com>",
   "license": "MIT",
@@ -43,7 +41,7 @@
     "karma-junit-reporter": "^1.2.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webdriver-launcher": "git+https://github.com/nhnent/karma-webdriver-launcher.git#v1.1.0",
+    "karma-webdriver-launcher": "git+https://github.com/nhn/karma-webdriver-launcher.git#v1.1.0",
     "karma-webpack": "^2.0.3",
     "safe-umd-webpack-plugin": "0.0.2",
     "tui-jsdoc-template": "^1.0.4",

package.json

@@ -39,65 +39,75 @@ var browser = {
     version: 0
 };
 
-var nav = window.navigator;
-var appName = nav.appName.replace(/\s/g, '_');
-var userAgent = nav.userAgent;
+if (window && window.navigator) {
+    detectBrowser();
+}
 
-var rIE = /MSIE\s([0-9]+[.0-9]*)/;
-var rIE11 = /Trident.*rv:11\./;
-var rEdge = /Edge\/(\d+)\./;
-var versionRegex = {
-    firefox: /Firefox\/(\d+)\./,
-    chrome: /Chrome\/(\d+)\./,
-    safari: /Version\/([\d.]+).*Safari\/(\d+)/
-};
+/**
+ * Detect the browser.
+ * @private
+ */
+function detectBrowser() {
+    var nav = window.navigator;
+    var appName = nav.appName.replace(/\s/g, '_');
+    var userAgent = nav.userAgent;
 
-var key, tmp;
+    var rIE = /MSIE\s([0-9]+[.0-9]*)/;
+    var rIE11 = /Trident.*rv:11\./;
+    var rEdge = /Edge\/(\d+)\./;
+    var versionRegex = {
+        firefox: /Firefox\/(\d+)\./,
+        chrome: /Chrome\/(\d+)\./,
+        safari: /Version\/([\d.]+).*Safari\/(\d+)/
+    };
 
-var detector = {
-    Microsoft_Internet_Explorer: function() { // eslint-disable-line camelcase
-        var detectedVersion = userAgent.match(rIE);
+    var key, tmp;
 
-        if (detectedVersion) { // ie8 ~ ie10
-            browser.msie = true;
-            browser.version = parseFloat(detectedVersion[1]);
-        } else { // no version information
-            browser.others = true;
-        }
-    },
-    Netscape: function() { // eslint-disable-line complexity
-        var detected = false;
+    var detector = {
+        Microsoft_Internet_Explorer: function() { // eslint-disable-line camelcase
+            var detectedVersion = userAgent.match(rIE);
+
+            if (detectedVersion) { // ie8 ~ ie10
+                browser.msie = true;
+                browser.version = parseFloat(detectedVersion[1]);
+            } else { // no version information
+                browser.others = true;
+            }
+        },
+        Netscape: function() { // eslint-disable-line complexity
+            var detected = false;
 
-        if (rIE11.exec(userAgent)) {
-            browser.msie = true;
-            browser.version = 11;
-            detected = true;
-        } else if (rEdge.exec(userAgent)) {
-            browser.edge = true;
-            browser.version = userAgent.match(rEdge)[1];
-            detected = true;
-        } else {
-            for (key in versionRegex) {
-                if (versionRegex.hasOwnProperty(key)) {
-                    tmp = userAgent.match(versionRegex[key]);
-                    if (tmp && tmp.length > 1) { // eslint-disable-line max-depth
-                        browser[key] = detected = true;
-                        browser.version = parseFloat(tmp[1] || 0);
-                        break;
+            if (rIE11.exec(userAgent)) {
+                browser.msie = true;
+                browser.version = 11;
+                detected = true;
+            } else if (rEdge.exec(userAgent)) {
+                browser.edge = true;
+                browser.version = userAgent.match(rEdge)[1];
+                detected = true;
+            } else {
+                for (key in versionRegex) {
+                    if (versionRegex.hasOwnProperty(key)) {
+                        tmp = userAgent.match(versionRegex[key]);
+                        if (tmp && tmp.length > 1) { // eslint-disable-line max-depth
+                            browser[key] = detected = true;
+                            browser.version = parseFloat(tmp[1] || 0);
+                            break;
+                        }
                     }
                 }
             }
+            if (!detected) {
+                browser.others = true;
+            }
         }
-        if (!detected) {
-            browser.others = true;
-        }
-    }
-};
+    };
 
-var fn = detector[appName];
+    var fn = detector[appName];
 
-if (fn) {
-    detector[appName]();
+    if (fn) {
+        detector[appName]();
+    }
 }
 
 module.exports = browser;

src/js/browser.js

@@ -41,16 +41,16 @@ describe('defineNamespace', function() {
     });
 
     it('for class', function() {
-        var name = 'Nhnent';
+        var name = 'nhn';
         var mInstance;
 
-        defineNamespace('asdf.Nhnent', function() {
+        defineNamespace('asdf.nhn', function() {
             this.name = name;
             this.getName = function() {
                 return this.name;
             };
         }, true);
-        mInstance = new asdf.Nhnent();
+        mInstance = new asdf.nhn();
 
         expect(mInstance.getName()).toBe(name);
     });