Skip to content

Commit

Permalink
cobaltians/Cobalt#92: update Cobalt, Fonts & Plugins to latest versio…
Browse files Browse the repository at this point in the history 
…n on develop. Update common Web submodule (bar colors & page names). TODO: Default Theme.
  • Loading branch information
Sébastien Vitard committed Oct 6, 2016
2 parents f81b605 + c6e4af0 commit 37639bf
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 48 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
path = Catalog/www/SharePlugin
url = git://github.com/Cobaltians-Plugins/Plugins-Share-Web.git
branch = develop
[submodule "PdfPlugin"]
path = PdfPlugin
url = [email protected]:Cobaltians-Plugins/Plugins-Pdf-iOS.git
branch = develop
[submodule "Catalog/www/PdfPlugin"]
path = Catalog/www/PdfPlugin
url = [email protected]:Cobaltians-Plugins/Plugins-Pdf-Web.git
branch = develop
[submodule "PdfPlugin"]
path = PdfPlugin
url = https://github.com/Cobaltians-Plugins/Plugins-Pdf-iOS.git
branch = develop
77 changes: 38 additions & 39 deletions Catalog.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,14 @@
BE1ABCF11B70F9C40070657C /* PubSubPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1ABCEE1B70F9C40070657C /* PubSubPlugin.m */; };
BE1ABCF21B70F9C40070657C /* PubSubReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1ABCF01B70F9C40070657C /* PubSubReceiver.m */; };
BE1B27CC1BCE9FE2003C0C61 /* ActionPickerPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BE1B27CB1BCE9FE2003C0C61 /* ActionPickerPlugin */; };
BE5D91501D6CA1E400E4B2C7 /* libCobalt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */; };
BE5D91511D6CA1F700E4B2C7 /* Cobalt.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */; };
BE7BE5471CA05CB400AADDEB /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5421CA05CB400AADDEB /* .gitignore */; };
BE7BE5481CA05CB400AADDEB /* FontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7BE5441CA05CB400AADDEB /* FontAwesome.m */; };
BE7BE5491CA05CB400AADDEB /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5451CA05CB400AADDEB /* FontAwesome.ttf */; };
BE7BE54A1CA05CB400AADDEB /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5461CA05CB400AADDEB /* LICENSE */; };
BE956EB91C47F5CD002DBEE3 /* libCobalt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EB41C47F5BC002DBEE3 /* libCobalt.a */; };
BE956EBA1C47F5D6002DBEE3 /* Cobalt.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */; };
BE956EBC1C47F653002DBEE3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */; };
BE956EBE1C47F65F002DBEE3 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */; };
BE9BC89A1D0717E600152C70 /* LocationListener.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9BC8991D0717E600152C70 /* LocationListener.m */; };
BEA867811B74E8B70072F61C /* LocationPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA8677E1B74E8B70072F61C /* LocationPlugin */; };
BEA867821B74E8B70072F61C /* PubSubPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA8677F1B74E8B70072F61C /* PubSubPlugin */; };
BEA867831B74E8B70072F61C /* WebServicesPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA867801B74E8B70072F61C /* WebServicesPlugin */; };
Expand All @@ -90,23 +89,23 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
BE956EB31C47F5BC002DBEE3 /* PBXContainerItemProxy */ = {
BE5D914A1D6CA18900E4B2C7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */;
containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BE31EB1B1C3EC52100141B6E;
remoteInfo = Cobalt;
};
BE956EB51C47F5BC002DBEE3 /* PBXContainerItemProxy */ = {
BE5D914C1D6CA18900E4B2C7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */;
containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BEFF884A1C4541FD0063AA18;
remoteInfo = CobaltResources;
};
BE956EB71C47F5C8002DBEE3 /* PBXContainerItemProxy */ = {
BE5D914E1D6CA1D600E4B2C7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */;
containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = BEFF882F1C3ED3BC0063AA18;
remoteInfo = Framework;
Expand Down Expand Up @@ -191,12 +190,12 @@
BE1ABCF01B70F9C40070657C /* PubSubReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PubSubReceiver.m; path = PubSubPlugin/PubSubReceiver.m; sourceTree = "<group>"; };
BE1B27CB1BCE9FE2003C0C61 /* ActionPickerPlugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ActionPickerPlugin; path = www/ActionPickerPlugin; sourceTree = "<group>"; };
BE208FEF1BD4DB5C000D2B5F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cobalt.xcodeproj; path = Cobalt/Cobalt.xcodeproj; sourceTree = "<group>"; };
BE7BE5421CA05CB400AADDEB /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
BE7BE5431CA05CB400AADDEB /* FontAwesome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontAwesome.h; sourceTree = "<group>"; };
BE7BE5441CA05CB400AADDEB /* FontAwesome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontAwesome.m; sourceTree = "<group>"; };
BE7BE5451CA05CB400AADDEB /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = "<group>"; };
BE7BE5461CA05CB400AADDEB /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cobalt.xcodeproj; path = Cobalt/Cobalt.xcodeproj; sourceTree = "<group>"; };
BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
BE9BC8981D0717E600152C70 /* LocationListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationListener.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -240,14 +239,14 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
540BD3D91CFDCDE200E0580A /* SafariServices.framework in Frameworks */,
542538FD1CEF2AE500190AF9 /* AddressBook.framework in Frameworks */,
6AAF551E1CD8DE04005C3123 /* SystemConfiguration.framework in Frameworks */,
BE956EBC1C47F653002DBEE3 /* CoreGraphics.framework in Frameworks */,
BEDE9EB61B7398DB00EAEB94 /* CoreLocation.framework in Frameworks */,
BE956EBE1C47F65F002DBEE3 /* JavaScriptCore.framework in Frameworks */,
540BD3D91CFDCDE200E0580A /* SafariServices.framework in Frameworks */,
6AAF551E1CD8DE04005C3123 /* SystemConfiguration.framework in Frameworks */,
BEDE9EB41B7398C700EAEB94 /* UIKit.framework in Frameworks */,
BE956EB91C47F5CD002DBEE3 /* libCobalt.a in Frameworks */,
BE5D91501D6CA1E400E4B2C7 /* libCobalt.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -395,6 +394,15 @@
name = AppDelegate;
sourceTree = "<group>";
};
BE5D91451D6CA18900E4B2C7 /* Products */ = {
isa = PBXGroup;
children = (
BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */,
BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */,
);
name = Products;
sourceTree = "<group>";
};
BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */ = {
isa = PBXGroup;
children = (
Expand All @@ -407,15 +415,6 @@
path = "Fonts-FontAwesome-iOS";
sourceTree = "<group>";
};
BE956EAE1C47F5BC002DBEE3 /* Products */ = {
isa = PBXGroup;
children = (
BE956EB41C47F5BC002DBEE3 /* libCobalt.a */,
BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */,
);
name = Products;
sourceTree = "<group>";
};
BEDD51871BCE993300E204AC /* ActionPickerPlugin */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -458,23 +457,23 @@
F01A5A0A1716EF4C0000DD94 /* Frameworks */ = {
isa = PBXGroup;
children = (
540BD3D81CFDCDE200E0580A /* SafariServices.framework */,
542538FC1CEF2AE500190AF9 /* AddressBook.framework */,
6AAF551D1CD8DE04005C3123 /* SystemConfiguration.framework */,
6AAF550E1CD8DD19005C3123 /* BatteryStatusPlugin */,
6AAF55031CD8DD0C005C3123 /* NetworkStatusPlugin */,
BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */,
BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */,
BEDE9EB51B7398DB00EAEB94 /* CoreLocation.framework */,
BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */,
540BD3D81CFDCDE200E0580A /* SafariServices.framework */,
6AAF551D1CD8DE04005C3123 /* SystemConfiguration.framework */,
BEDE9EB31B7398C700EAEB94 /* UIKit.framework */,
BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */,
BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */,
BEDD51871BCE993300E204AC /* ActionPickerPlugin */,
BEDD8DA21BAC282C00265616 /* AppInfosPlugin */,
6AAF550E1CD8DD19005C3123 /* BatteryStatusPlugin */,
BE1ABCD81B70F9730070657C /* LocationPlugin */,
6AAF55031CD8DD0C005C3123 /* NetworkStatusPlugin */,
540BD3DA1CFDCF1400E0580A /* PdfPlugin */,
BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */,
BE1ABCEC1B70F9B50070657C /* PubSubPlugin */,
54EC75511CEF2910006E02DD /* SharePlugin */,
BE1ABCD81B70F9730070657C /* LocationPlugin */,
F0AF225B1AFD639400B58B07 /* WebServicesPlugin */,
);
name = Frameworks;
Expand Down Expand Up @@ -534,7 +533,7 @@
buildRules = (
);
dependencies = (
BE956EB81C47F5C8002DBEE3 /* PBXTargetDependency */,
BE5D914F1D6CA1D600E4B2C7 /* PBXTargetDependency */,
);
name = Catalog;
productName = Catalog;
Expand Down Expand Up @@ -569,8 +568,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = BE956EAE1C47F5BC002DBEE3 /* Products */;
ProjectRef = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */;
ProductGroup = BE5D91451D6CA18900E4B2C7 /* Products */;
ProjectRef = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */;
},
);
projectRoot = "";
Expand All @@ -581,18 +580,18 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
BE956EB41C47F5BC002DBEE3 /* libCobalt.a */ = {
BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libCobalt.a;
remoteRef = BE956EB31C47F5BC002DBEE3 /* PBXContainerItemProxy */;
remoteRef = BE5D914A1D6CA18900E4B2C7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */ = {
BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = Cobalt.bundle;
remoteRef = BE956EB51C47F5BC002DBEE3 /* PBXContainerItemProxy */;
remoteRef = BE5D914C1D6CA18900E4B2C7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down Expand Up @@ -649,7 +648,7 @@
8E751EA819EEB62400EDFF4D /* black_sun.png in Resources */,
F0FB6E4219B45EF600021401 /* common in Resources */,
8E751EA919EEB62400EDFF4D /* [email protected] in Resources */,
BE956EBA1C47F5D6002DBEE3 /* Cobalt.bundle in Resources */,
BE5D91511D6CA1F700E4B2C7 /* Cobalt.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -689,10 +688,10 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
BE956EB81C47F5C8002DBEE3 /* PBXTargetDependency */ = {
BE5D914F1D6CA1D600E4B2C7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Framework;
targetProxy = BE956EB71C47F5C8002DBEE3 /* PBXContainerItemProxy */;
targetProxy = BE5D914E1D6CA1D600E4B2C7 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

Expand Down
2 changes: 1 addition & 1 deletion Catalog/www/common
Submodule common updated 20 files
+2 −2 appEvents.html
+1 −1 callbacks.html
+16 −15 cobalt.conf
+2 −2 events.html
+2 −2 infinitescroll.html
+2 −2 localstorage.html
+2 −2 localstorage_page2.html
+2 −2 nativeBars.html
+2 −2 navigation.html
+2 −2 navigation_popToController.html
+2 −2 navigation_popTo_A.html
+2 −2 navigation_popTo_B.html
+2 −2 navigation_popTo_C.html
+2 −2 navigation_pushedWithData.html
+1 −1 plugins-pubsub2.html
+1 −1 plugins-webservices.html
+2 −2 pulltorefresh.html
+2 −2 simple_page.html
+1 −2 weblayer_content_2.html
+1 −1 weblayers.html
2 changes: 1 addition & 1 deletion Catalog/www/platform
Submodule platform updated 2 files
+14 −71 cobalt.js
+1 −1 cobalt.min.js
2 changes: 1 addition & 1 deletion Cobalt
Submodule Cobalt updated 11 files
+9 −1 Cobalt.xcodeproj/project.pbxproj
+2 −0 Cobalt/Cobalt.h
+2 −2 Cobalt/Cobalt.m
+39 −0 Cobalt/CobaltAlert.h
+193 −0 Cobalt/CobaltAlert.m
+10 −4 Cobalt/CobaltBarButtonItem.h
+124 −68 Cobalt/CobaltBarButtonItem.m
+4 −0 Cobalt/CobaltButton.h
+35 −3 Cobalt/CobaltButton.m
+4 −7 Cobalt/CobaltViewController.h
+314 −257 Cobalt/CobaltViewController.m
2 changes: 1 addition & 1 deletion Fonts-FontAwesome-iOS
Submodule Fonts-FontAwesome-iOS updated 1 files
+97 −0 FontAwesome.m
2 changes: 1 addition & 1 deletion SharePlugin
Submodule SharePlugin updated 0 files

0 comments on commit 37639bf

Please sign in to comment.