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

* origin/tizen:
  PROJTEMP : Update index.managed.js.xslt for widget does not have id.
  PROJECTEP : bugfix for manged_css. Modify page_managed_css file.
  Merge remote-tracking branch 'origin/develop' into tizen
  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: I384d58a15fd2fd8f22d1f9eb27279889f6cd3001
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --git a/package/changelog b/package/changelog
index 3a1c6b8..85aa6d4 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 0.1.314
+- [Title] Update version.
+== Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-15
 * 0.1.313
 - [Title] Update version.
 == Yonghwan Jeon <yonghwan82.jeon@samsung.com> 2014-05-14

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index b4eef4c..bc145a7 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package : mobile-2.3-web-ui-builder-template
-Version :0.1.313
+Version :0.1.314
 OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
 Maintainer : Changyeon Lee <changyeon.lee@samsung.com>, Gyeongmin Ju <gyeongmin.ju@samsung.com>, Nakyoung Choi <nakyoung2.choi@samsung.com>, Yonghwan Jeon <yonghwan82.jeon@samsung.com>

diff --git a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
index d659bb8..c80af01 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
@@ -77,8 +77,11 @@ app.init = function() {
                <xsl:when test="name() = 'openUrl'">
                </xsl:when>
                <xsl:otherwise>
-                       <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
-                       <xsl:value-of select="concat('undefined;', $newline)"/>
+                   <xsl:if test="@id != ''">
+                           <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
+                   <xsl:value-of select="concat('undefined;', $newline)"/>
+                   </xsl:if>
+                       
                </xsl:otherwise>
        </xsl:choose>
 </xsl:for-each>
@@ -116,13 +119,15 @@ app.init = function() {
 <xsl:when test="name() = 'openUrl'">
 </xsl:when>
 <xsl:otherwise>
-<xsl:text>
+<xsl:if test="@id != ''">
+    <xsl:text>
                /**
                * @type jQueryObject
                */
-</xsl:text>
-<xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
-<xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+    </xsl:text>
+       <xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
+       <xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+</xsl:if>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:for-each>

diff --git a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index c0c1409..d11745d 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@ -28,7 +28,7 @@
                <xsl:for-each select="screen">
                        <!--  xsl:sort select="width" order="descending" data-type="number" / -->
 
-                               <xsl:variable name="nscreen-name"><xsl:value-of select="@name" /></xsl:variable>
+                               <xsl:variable name="nscreen-name"><xsl:value-of select="@fineName" /></xsl:variable>
 
                                <xsl:variable name='device-width'>
                                        <xsl:choose>
@@ -111,4 +111,4 @@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
index d659bb8..c80af01 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
@@ -77,8 +77,11 @@ app.init = function() {
                <xsl:when test="name() = 'openUrl'">
                </xsl:when>
                <xsl:otherwise>
-                       <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
-                       <xsl:value-of select="concat('undefined;', $newline)"/>
+                   <xsl:if test="@id != ''">
+                           <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
+                   <xsl:value-of select="concat('undefined;', $newline)"/>
+                   </xsl:if>
+                       
                </xsl:otherwise>
        </xsl:choose>
 </xsl:for-each>
@@ -116,13 +119,15 @@ app.init = function() {
 <xsl:when test="name() = 'openUrl'">
 </xsl:when>
 <xsl:otherwise>
-<xsl:text>
+<xsl:if test="@id != ''">
+    <xsl:text>
                /**
                * @type jQueryObject
                */
-</xsl:text>
-<xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
-<xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+    </xsl:text>
+       <xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
+       <xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+</xsl:if>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:for-each>

diff --git a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index c0c1409..d11745d 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@ -28,7 +28,7 @@
                <xsl:for-each select="screen">
                        <!--  xsl:sort select="width" order="descending" data-type="number" / -->
 
-                               <xsl:variable name="nscreen-name"><xsl:value-of select="@name" /></xsl:variable>
+                               <xsl:variable name="nscreen-name"><xsl:value-of select="@fineName" /></xsl:variable>
 
                                <xsl:variable name='device-width'>
                                        <xsl:choose>
@@ -111,4 +111,4 @@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
index d659bb8..c80af01 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
@@ -77,8 +77,11 @@ app.init = function() {
                <xsl:when test="name() = 'openUrl'">
                </xsl:when>
                <xsl:otherwise>
-                       <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
-                       <xsl:value-of select="concat('undefined;', $newline)"/>
+                   <xsl:if test="@id != ''">
+                           <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
+                   <xsl:value-of select="concat('undefined;', $newline)"/>
+                   </xsl:if>
+                       
                </xsl:otherwise>
        </xsl:choose>
 </xsl:for-each>
@@ -116,13 +119,15 @@ app.init = function() {
 <xsl:when test="name() = 'openUrl'">
 </xsl:when>
 <xsl:otherwise>
-<xsl:text>
+<xsl:if test="@id != ''">
+    <xsl:text>
                /**
                * @type jQueryObject
                */
-</xsl:text>
-<xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
-<xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+    </xsl:text>
+       <xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
+       <xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+</xsl:if>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:for-each>

diff --git a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index c0c1409..d11745d 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@ -28,7 +28,7 @@
                <xsl:for-each select="screen">
                        <!--  xsl:sort select="width" order="descending" data-type="number" / -->
 
-                               <xsl:variable name="nscreen-name"><xsl:value-of select="@name" /></xsl:variable>
+                               <xsl:variable name="nscreen-name"><xsl:value-of select="@fineName" /></xsl:variable>
 
                                <xsl:variable name='device-width'>
                                        <xsl:choose>
@@ -111,4 +111,4 @@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
index d659bb8..c80af01 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/index_managed_js_ver0_0_1.xslt
@@ -77,8 +77,11 @@ app.init = function() {
                <xsl:when test="name() = 'openUrl'">
                </xsl:when>
                <xsl:otherwise>
-                       <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
-                       <xsl:value-of select="concat('undefined;', $newline)"/>
+                   <xsl:if test="@id != ''">
+                           <xsl:value-of select="concat($class_name, '.prototype.', @id, ' = ')"/>
+                   <xsl:value-of select="concat('undefined;', $newline)"/>
+                   </xsl:if>
+                       
                </xsl:otherwise>
        </xsl:choose>
 </xsl:for-each>
@@ -116,13 +119,15 @@ app.init = function() {
 <xsl:when test="name() = 'openUrl'">
 </xsl:when>
 <xsl:otherwise>
-<xsl:text>
+<xsl:if test="@id != ''">
+    <xsl:text>
                /**
                * @type jQueryObject
                */
-</xsl:text>
-<xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
-<xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+    </xsl:text>
+       <xsl:value-of select="concat($tab, $tab, $class_name, '.prototype.', @id, ' = ')"/>
+       <xsl:value-of select="concat('$(', '&quot;', '#', $page_name, ' ', '#', @id, '&quot;', ');', $newline)"/>
+</xsl:if>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:for-each>

diff --git a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index c0c1409..d11745d 100644 (file)
--- a/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@ -28,7 +28,7 @@
                <xsl:for-each select="screen">
                        <!--  xsl:sort select="width" order="descending" data-type="number" / -->
 
-                               <xsl:variable name="nscreen-name"><xsl:value-of select="@name" /></xsl:variable>
+                               <xsl:variable name="nscreen-name"><xsl:value-of select="@fineName" /></xsl:variable>
 
                                <xsl:variable name='device-width'>
                                        <xsl:choose>
@@ -111,4 +111,4 @@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>