From: brianjjones <brian.j.jones@intel.com>
Date: Tue, 6 May 2014 22:24:37 +0000 (-0700)
Subject: Updated to work with Crosswalk.  TIVI-3073
X-Git-Tag: accepted/tizen/ivi/20140512.060822^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c977e362a4aec68abccab181ff273b7cf4615efb;p=profile%2Fivi%2FModello_Common.git

Updated to work with Crosswalk.  TIVI-3073

Change-Id: I48c42ceb0dcae6dada11127f7f0948afdd868ac7
Signed-off-by: brianjjones <brian.j.jones@intel.com>
---

diff --git a/Makefile b/Makefile
index 75d452f..9e846b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,16 @@
-PROJECT = html5_UI_Common
+PROJECT = Modello_Common
 
-VERSION := 0.0.1
+VERSION := 0.0.2
 PACKAGE = $(PROJECT)-$(VERSION)
 
-#INSTALL_FILES = $(PROJECT).wgt
 INSTALL_DIR = ${DESTDIR}/opt/usr/apps/_common
 
 all:
-	#zip -r $(PROJECT).wgt config.xml index.html icon.png js css
 
 install:
 	@echo "Installing Common UI files package, stand by..."
-	mkdir -p $(INSTALL_DIR)/
+	mkdir -p $(INSTALL_DIR)/css
+	mkdir -p $(INSTALL_DIR)/js
 	cp -r css $(INSTALL_DIR)/
 	cp -r js $(INSTALL_DIR)/
 
-dist:
-	tar czf ../$(PACKAGE).tar.bz2 .
-
diff --git a/css/car/components/topBarIcons/topBarIcons.js b/css/car/components/topBarIcons/topBarIcons.js
index ff08b66..e150342 100644
--- a/css/car/components/topBarIcons/topBarIcons.js
+++ b/css/car/components/topBarIcons/topBarIcons.js
@@ -213,7 +213,7 @@ function launchApplication(id) {
 
 					for (i = 0; i < list.length; i++) {
 						var app = list[i];
-						if (app.id.indexOf('html5POC') >= 0) {
+						if (app.id.indexOf('Modello') >= 0) {
 							var newApp = {
 								id: app.id,
 								appName: app.name,
@@ -224,7 +224,7 @@ function launchApplication(id) {
 								running: TopBarIcons.runningAppName === app.id
 							};
 
-							if (app.id === "html5POC04.HomeScreen") {
+							if (app.id === "Modello005.HomeScreen") {
 								homeScreenApp = newApp;
 							} else {
 								//app filter to block adding some apps into topbar
diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes
index 5bfcd44..9e11809 100644
--- a/packaging/modello-common.changes
+++ b/packaging/modello-common.changes
@@ -1,3 +1,6 @@
+* Tue May 06 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140424.173419@4b787b3
+- Updated to work with Crosswalk.  TIVI-3073
+
 * Wed Apr 23 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140417.181410@01a5441
 - Fix for TIVI-3061 - WIFI sometimes can't be turned on/off
 
diff --git a/packaging/modello-common.spec b/packaging/modello-common.spec
index 359d88d..9401bd3 100644
--- a/packaging/modello-common.spec
+++ b/packaging/modello-common.spec
@@ -1,14 +1,11 @@
 Name:       Modello_Common
 Summary:    A proof of concept pure html5 UI
-Version:    0.0.1
+Version:    0.0.2
 Release:    1
 Group:      Applications/System
 License:    Apache 2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
-BuildRequires:  zip
-Requires:   wrt-installer
-Requires:   wrt-plugins-ivi
 
 %description
 A proof of concept pure html5 UI
@@ -18,18 +15,10 @@ A proof of concept pure html5 UI
 
 %build
 
-#make wgtPkg
-
 %install
 rm -rf %{buildroot}
 %make_install
 
-%post
-
-%postun
-    #TODO: Delete the common files
-    #wrt-installer -un html5POC01.html5_UI_Common
-
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/_common/*