Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROJTEMP : Update image descriptor.
  PROJTEMP : Update image widget descriptor.
  PROJTEMP : Add display style.
  PROJTEMP : Modify javascript for widget position.
  Merge remote-tracking branch 'origin/tizen' into develop
  PROJTEMP : Update "modifyStyle" function.
  Merge remote-tracking branch 'origin/nscreen' into develop

Change-Id: I3a83838b4a8c63a7df0c44e817fba6d2e779d7ed
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --git a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
index 98a5a34..26221fa 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
@@ -7,6 +7,7 @@
 <style>
        <category name="layout" displayName="Layout" brief="%position%">
                <property name="position" type="position@position" displayName="Position" deafult=""></property>
+               <property name="display" type="display@display" displayName="Display" deafult="inline"></property>
        </category>
     <category name="dimension" displayName="Dimension" brief="%left%,%top%,%width%,%height%">
        <property name="left" type="size" displayName="Left" default="auto" inline="true"></property>

diff --git a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 57a9414..65d2c37 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@ -648,6 +648,29 @@
                <constant value="static" displayName="static" />
                <constant value="fixed" displayName="fixed" />
        </type>
+       <type id="display@display">
+          <constant value="" displayName="(None)"/>
+          <constant value="none" displayName="none"/>
+          <constant value="inline" displayName="inline"/>
+       <constant value="initial" displayName="initial"/>
+       <constant value="inherit" displayName="inherit"/>
+          <constant value="block" displayName="block"/>
+          <constant value="flex" displayName="flex"/>
+          <constant value="inline-block" displayName="inline-block"/>
+          <constant value="inline-flex" displayName="inline-flex"/>
+          <constant value="inline-table" displayName="inline-table"/>
+          <constant value="list-item" displayName="list-item"/>
+          <constant value="run-in" displayName="run-in"/>
+          <constant value="table" displayName="table"/>
+          <constant value="table-caption" displayName="table-caption"/>
+          <constant value="table-column-group" displayName="table-column-group"/>
+          <constant value="table-header-group" displayName="table-header-group"/>
+          <constant value="table-footer-group" displayName="table-footer-group"/>
+          <constant value="table-row-group" displayName="table-row-group"/>
+          <constant value="table-cell" displayName="table-cell"/>
+          <constant value="table-column" displayName="table-column"/>
+          <constant value="table-row" displayName="table-row"/>
+       </type>
 
        <type id="background@repeat">
                <constant value=""                  displayName="(None)" />
@@ -794,8 +817,8 @@
        </type>
 
        <type id="attrtext@databinding">
-               <constant value="attr" displayName="form"/>
-               <constant value="attr" displayName="for"/>
                <constant value="text" displayName=""/>
+               <constant value="attr" displayName="for"/>
+               <constant value="attr" displayName="form"/>
        </type>
 </types>
\ No newline at end of file

diff --git a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
index 67663a5..7c762a9 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
@@ -121,6 +121,7 @@ function showBorder(wid) {
 function getClientBound() {
        var wgt = $(".ui-scrollview-view");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        // var head_height = $('[data-role=header]').outerHeight();
        // var footer_height = $('[data-role=footer]').outerHeight();
@@ -138,7 +139,11 @@ function getClientBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -152,6 +157,7 @@ function getClientBound() {
 function getWindowBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var head_height = $('[data-role=header]').outerHeight();
        var footer_height = $('[data-role=footer]').outerHeight();
@@ -165,7 +171,11 @@ function getWindowBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -177,6 +187,7 @@ function getWindowBound() {
 function getPageBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var content_width = $(window).width();
        var content_height = $(window).height();
@@ -189,13 +200,18 @@ function getPageBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        return bound;
 }
 
 function getOneWidgetBound(wgt) {
        var loc = wgt.offset();
+       var pos = wgt.position();
        var origin = wgt.css("-webkit-transform-origin").split(" ");
 
        var bound = {
@@ -207,6 +223,10 @@ function getOneWidgetBound(wgt) {
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
                b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height()),
                transform : wgt.css("-webkit-transform"),
                transformOriginX : parseFloat(origin[0]),
                transformOriginY : parseFloat(origin[1]),

diff --git a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
index 98a5a34..26221fa 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
@@ -7,6 +7,7 @@
 <style>
        <category name="layout" displayName="Layout" brief="%position%">
                <property name="position" type="position@position" displayName="Position" deafult=""></property>
+               <property name="display" type="display@display" displayName="Display" deafult="inline"></property>
        </category>
     <category name="dimension" displayName="Dimension" brief="%left%,%top%,%width%,%height%">
        <property name="left" type="size" displayName="Left" default="auto" inline="true"></property>

diff --git a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 57a9414..65d2c37 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@ -648,6 +648,29 @@
                <constant value="static" displayName="static" />
                <constant value="fixed" displayName="fixed" />
        </type>
+       <type id="display@display">
+          <constant value="" displayName="(None)"/>
+          <constant value="none" displayName="none"/>
+          <constant value="inline" displayName="inline"/>
+       <constant value="initial" displayName="initial"/>
+       <constant value="inherit" displayName="inherit"/>
+          <constant value="block" displayName="block"/>
+          <constant value="flex" displayName="flex"/>
+          <constant value="inline-block" displayName="inline-block"/>
+          <constant value="inline-flex" displayName="inline-flex"/>
+          <constant value="inline-table" displayName="inline-table"/>
+          <constant value="list-item" displayName="list-item"/>
+          <constant value="run-in" displayName="run-in"/>
+          <constant value="table" displayName="table"/>
+          <constant value="table-caption" displayName="table-caption"/>
+          <constant value="table-column-group" displayName="table-column-group"/>
+          <constant value="table-header-group" displayName="table-header-group"/>
+          <constant value="table-footer-group" displayName="table-footer-group"/>
+          <constant value="table-row-group" displayName="table-row-group"/>
+          <constant value="table-cell" displayName="table-cell"/>
+          <constant value="table-column" displayName="table-column"/>
+          <constant value="table-row" displayName="table-row"/>
+       </type>
 
        <type id="background@repeat">
                <constant value=""                  displayName="(None)" />
@@ -794,8 +817,8 @@
        </type>
 
        <type id="attrtext@databinding">
-               <constant value="attr" displayName="form"/>
-               <constant value="attr" displayName="for"/>
                <constant value="text" displayName=""/>
+               <constant value="attr" displayName="for"/>
+               <constant value="attr" displayName="form"/>
        </type>
 </types>
\ No newline at end of file

diff --git a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
index 67663a5..7c762a9 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
@@ -121,6 +121,7 @@ function showBorder(wid) {
 function getClientBound() {
        var wgt = $(".ui-scrollview-view");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        // var head_height = $('[data-role=header]').outerHeight();
        // var footer_height = $('[data-role=footer]').outerHeight();
@@ -138,7 +139,11 @@ function getClientBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -152,6 +157,7 @@ function getClientBound() {
 function getWindowBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var head_height = $('[data-role=header]').outerHeight();
        var footer_height = $('[data-role=footer]').outerHeight();
@@ -165,7 +171,11 @@ function getWindowBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -177,6 +187,7 @@ function getWindowBound() {
 function getPageBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var content_width = $(window).width();
        var content_height = $(window).height();
@@ -189,13 +200,18 @@ function getPageBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        return bound;
 }
 
 function getOneWidgetBound(wgt) {
        var loc = wgt.offset();
+       var pos = wgt.position();
        var origin = wgt.css("-webkit-transform-origin").split(" ");
 
        var bound = {
@@ -207,6 +223,10 @@ function getOneWidgetBound(wgt) {
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
                b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height()),
                transform : wgt.css("-webkit-transform"),
                transformOriginX : parseFloat(origin[0]),
                transformOriginY : parseFloat(origin[1]),

diff --git a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
index 98a5a34..26221fa 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
@@ -7,6 +7,7 @@
 <style>
        <category name="layout" displayName="Layout" brief="%position%">
                <property name="position" type="position@position" displayName="Position" deafult=""></property>
+               <property name="display" type="display@display" displayName="Display" deafult="inline"></property>
        </category>
     <category name="dimension" displayName="Dimension" brief="%left%,%top%,%width%,%height%">
        <property name="left" type="size" displayName="Left" default="auto" inline="true"></property>

diff --git a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 57a9414..65d2c37 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@ -648,6 +648,29 @@
                <constant value="static" displayName="static" />
                <constant value="fixed" displayName="fixed" />
        </type>
+       <type id="display@display">
+          <constant value="" displayName="(None)"/>
+          <constant value="none" displayName="none"/>
+          <constant value="inline" displayName="inline"/>
+       <constant value="initial" displayName="initial"/>
+       <constant value="inherit" displayName="inherit"/>
+          <constant value="block" displayName="block"/>
+          <constant value="flex" displayName="flex"/>
+          <constant value="inline-block" displayName="inline-block"/>
+          <constant value="inline-flex" displayName="inline-flex"/>
+          <constant value="inline-table" displayName="inline-table"/>
+          <constant value="list-item" displayName="list-item"/>
+          <constant value="run-in" displayName="run-in"/>
+          <constant value="table" displayName="table"/>
+          <constant value="table-caption" displayName="table-caption"/>
+          <constant value="table-column-group" displayName="table-column-group"/>
+          <constant value="table-header-group" displayName="table-header-group"/>
+          <constant value="table-footer-group" displayName="table-footer-group"/>
+          <constant value="table-row-group" displayName="table-row-group"/>
+          <constant value="table-cell" displayName="table-cell"/>
+          <constant value="table-column" displayName="table-column"/>
+          <constant value="table-row" displayName="table-row"/>
+       </type>
 
        <type id="background@repeat">
                <constant value=""                  displayName="(None)" />
@@ -794,8 +817,8 @@
        </type>
 
        <type id="attrtext@databinding">
-               <constant value="attr" displayName="form"/>
-               <constant value="attr" displayName="for"/>
                <constant value="text" displayName=""/>
+               <constant value="attr" displayName="for"/>
+               <constant value="attr" displayName="form"/>
        </type>
 </types>
\ No newline at end of file

diff --git a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
index 67663a5..7c762a9 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
@@ -121,6 +121,7 @@ function showBorder(wid) {
 function getClientBound() {
        var wgt = $(".ui-scrollview-view");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        // var head_height = $('[data-role=header]').outerHeight();
        // var footer_height = $('[data-role=footer]').outerHeight();
@@ -138,7 +139,11 @@ function getClientBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -152,6 +157,7 @@ function getClientBound() {
 function getWindowBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var head_height = $('[data-role=header]').outerHeight();
        var footer_height = $('[data-role=footer]').outerHeight();
@@ -165,7 +171,11 @@ function getWindowBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -177,6 +187,7 @@ function getWindowBound() {
 function getPageBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var content_width = $(window).width();
        var content_height = $(window).height();
@@ -189,13 +200,18 @@ function getPageBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        return bound;
 }
 
 function getOneWidgetBound(wgt) {
        var loc = wgt.offset();
+       var pos = wgt.position();
        var origin = wgt.css("-webkit-transform-origin").split(" ");
 
        var bound = {
@@ -207,6 +223,10 @@ function getOneWidgetBound(wgt) {
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
                b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height()),
                transform : wgt.css("-webkit-transform"),
                transformOriginX : parseFloat(origin[0]),
                transformOriginY : parseFloat(origin[1]),

diff --git a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
index 98a5a34..26221fa 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
@@ -7,6 +7,7 @@
 <style>
        <category name="layout" displayName="Layout" brief="%position%">
                <property name="position" type="position@position" displayName="Position" deafult=""></property>
+               <property name="display" type="display@display" displayName="Display" deafult="inline"></property>
        </category>
     <category name="dimension" displayName="Dimension" brief="%left%,%top%,%width%,%height%">
        <property name="left" type="size" displayName="Left" default="auto" inline="true"></property>

diff --git a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 57a9414..65d2c37 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@ -648,6 +648,29 @@
                <constant value="static" displayName="static" />
                <constant value="fixed" displayName="fixed" />
        </type>
+       <type id="display@display">
+          <constant value="" displayName="(None)"/>
+          <constant value="none" displayName="none"/>
+          <constant value="inline" displayName="inline"/>
+       <constant value="initial" displayName="initial"/>
+       <constant value="inherit" displayName="inherit"/>
+          <constant value="block" displayName="block"/>
+          <constant value="flex" displayName="flex"/>
+          <constant value="inline-block" displayName="inline-block"/>
+          <constant value="inline-flex" displayName="inline-flex"/>
+          <constant value="inline-table" displayName="inline-table"/>
+          <constant value="list-item" displayName="list-item"/>
+          <constant value="run-in" displayName="run-in"/>
+          <constant value="table" displayName="table"/>
+          <constant value="table-caption" displayName="table-caption"/>
+          <constant value="table-column-group" displayName="table-column-group"/>
+          <constant value="table-header-group" displayName="table-header-group"/>
+          <constant value="table-footer-group" displayName="table-footer-group"/>
+          <constant value="table-row-group" displayName="table-row-group"/>
+          <constant value="table-cell" displayName="table-cell"/>
+          <constant value="table-column" displayName="table-column"/>
+          <constant value="table-row" displayName="table-row"/>
+       </type>
 
        <type id="background@repeat">
                <constant value=""                  displayName="(None)" />
@@ -794,8 +817,8 @@
        </type>
 
        <type id="attrtext@databinding">
-               <constant value="attr" displayName="form"/>
-               <constant value="attr" displayName="for"/>
                <constant value="text" displayName=""/>
+               <constant value="attr" displayName="for"/>
+               <constant value="attr" displayName="form"/>
        </type>
 </types>
\ No newline at end of file

diff --git a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
index 67663a5..7c762a9 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
@@ -121,6 +121,7 @@ function showBorder(wid) {
 function getClientBound() {
        var wgt = $(".ui-scrollview-view");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        // var head_height = $('[data-role=header]').outerHeight();
        // var footer_height = $('[data-role=footer]').outerHeight();
@@ -138,7 +139,11 @@ function getClientBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -152,6 +157,7 @@ function getClientBound() {
 function getWindowBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var head_height = $('[data-role=header]').outerHeight();
        var footer_height = $('[data-role=footer]').outerHeight();
@@ -165,7 +171,11 @@ function getWindowBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -177,6 +187,7 @@ function getWindowBound() {
 function getPageBound() {
        var wgt = $(".ui-scrollview-clip");
        var loc = wgt.offset();
+       var pos = wgt.position();
 
        var content_width = $(window).width();
        var content_height = $(window).height();
@@ -189,13 +200,18 @@ function getPageBound() {
                l : parseInt(wgt.css("margin-left")),
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
-               b : parseInt(wgt.css("margin-bottom"))
+               b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height())
        };
        return bound;
 }
 
 function getOneWidgetBound(wgt) {
        var loc = wgt.offset();
+       var pos = wgt.position();
        var origin = wgt.css("-webkit-transform-origin").split(" ");
 
        var bound = {
@@ -207,6 +223,10 @@ function getOneWidgetBound(wgt) {
                r : parseInt(wgt.css("margin-right")),
                t : parseInt(wgt.css("margin-top")),
                b : parseInt(wgt.css("margin-bottom")),
+               left : parseInt(pos.left),
+               top : parseInt(pos.top),
+    width : parseInt(wgt.width()),
+    height : parseInt(wgt.height()),
                transform : wgt.css("-webkit-transform"),
                transformOriginX : parseFloat(origin[0]),
                transformOriginY : parseFloat(origin[1]),