Merge remote-tracking branch 'origin/develop' into tizen 16/19316/1
authornakyoung2.choi <nakyoung2.choi@samsung.com>
Thu, 10 Apr 2014 08:35:46 +0000 (17:35 +0900)
committernakyoung2.choi <nakyoung2.choi@samsung.com>
Thu, 10 Apr 2014 08:35:46 +0000 (17:35 +0900)
commit00b7cf34d2e75a31cd6b8a173f2d0aa8d31f5dbf
treee08815b00bb4eaf3d4a4adb47af8158dd02dda27
parent91e8714c003e569855669431b0a9bdc68808fc8c
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROJTEMP : Modify predefined animation descriptor Change rotate to rotateZ in rollIn, rollOut Seperate proerty in flip
  DATABIND : Fixed a bug in the code generation.
  PROJTEMP : Modify predefined animation descriptor Add keyframe for bounce. Change property name for rollIn, rollOut(rotate -> rotateZ)
  PROJTEMP: add dataSourceCallhistory class (uibinding.js) a. parameters are changed to the upper case b. add new class that dataSourceCallhistory
  PROJTEMP: fix the Calendar Class a. add device apis ( unified, default, selected calendarId)
  PROJTEMP: add dataSourceCalendar class in the uibinding.js a. rename the parameter, from type to method b. define the new class for dataSourceCalendar that using tizen calendar apis
  UIB : Update ground.js for live dom.

Change-Id: I837f1bbc5bbea99d39fac6997c8bdda857854b94
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
28 files changed:
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.bounce.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.flip.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollIn.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollOut.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.bounce.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.flip.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollIn.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollOut.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.bounce.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.flip.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollIn.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollOut.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-fw/uibinding.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.bounce.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.emphasis.flip.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollIn.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/animator/css/tizen.animator.exit.rollOut.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt