Skip to content

Commit

Permalink
Merge branch 'master' into applyJSCS
Browse files Browse the repository at this point in the history
  • Loading branch information
Jongmoon Yoon authored and Jongmoon Yoon committed Sep 7, 2015
2 parents f4131cf + dda8a92 commit 23bbb58
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/class.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ eg.module("class", [eg], function(ns) {
*
* Class
* The Class() object is used to implement the application using object-oriented programming.
* @group EvergreenJs
* @group egjs
* @ko Class는 어플리케이션을 객체지향 프로그래밍 방식으로 구현하는데 사용합니다.
* @class
* @name eg.Class
Expand Down
2 changes: 1 addition & 1 deletion src/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ eg.module("component", [eg], function(ns) {
/**
* Component
* @class
* @group EvergreenJs
* @group egjs
* @name eg.Component
*/
ns.Component = ns.Class({
Expand Down
2 changes: 1 addition & 1 deletion src/eg.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ eg.module("eg", [window.jQuery, eg, window], function($, ns, global) {

/**
* @namespace eg
* @group EvergreenJs
* @group egjs
*/
var ua;
var eg = {
Expand Down
2 changes: 1 addition & 1 deletion src/flicking.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eg.module("flicking",[window.jQuery, eg, eg.MovableCoord],function($, ns, MC) {
/**
* To build flickable UI
* @group EvergreenJs
* @group egjs
* @ko 플리킹 UI를 구성한다.
* @class
* @name eg.Flicking
Expand Down
2 changes: 1 addition & 1 deletion src/movableCoord.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ eg.module("movableCoord",[window.jQuery, eg, window.Hammer],function($, ns, HM){
// ns.__checkLibrary__( !("easeOutQuint" in $.easing), "You must download jQuery Easing Plugin(http://gsgd.co.uk/sandbox/jquery/easing/)\n\ne.g. bower install jquery.easing");
/**
* The MovableCoord can control coordinate by user's action.
* @group EvergreenJs
* @group egjs
* @ko MovableCoord는 사용자 행동에 의해, 좌표계를 제어할 수 있다.
* @class
* @name eg.MovableCoord
Expand Down
2 changes: 1 addition & 1 deletion src/visible.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ eg.module("visible",[window.jQuery, eg],function($, ns){
* @class
* @name eg.Visible
* @extends eg.Component
* @group EvergreenJs
* @group egjs
*
* @param {Object} options
* @param {HTMLElement|String|jQuery} [options.wrapper=document] The parent element that to check targets (wrapper is only one.) <ko>확인할 영역의 상위 엘리먼트</ko>
Expand Down

0 comments on commit 23bbb58

Please sign in to comment.