Move API to navigator.Fonts

eb1 · Dec 2, 2014 · b8493fc · b8493fc
1 parent e3e0d2c
commit b8493fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -11,8 +11,9 @@
     <keywords>cordova,fonts</keywords>
     <repo>https://github.com/adapt-it/cordova-fonts.git</repo>
     <issue>https://github.com/adapt-it/cordova-fonts/issues</issue>
+    <!-- expose our API under navigator.Fonts -->
     <js-module name="fonts" src="www/fonts.js">
-        <clobbers target="cordova.plugins.fonts" />
+        <clobbers target="navigator.Fonts" />
     </js-module>
     <!-- ios -->
     <platform name="ios">

diff --git a/src/ios/CDVFonts.m b/src/ios/CDVFonts.m
@@ -9,18 +9,17 @@ - (void)fonts:(CDVInvokedUrlCommand*)command
 
     NSArray *familyNames = [[NSArray alloc] initWithArray:[UIFont familyNames]];
     NSArray *fontNames;
-    NSMutableArray* fonts = [NSMutableArray array];
+    NSMutableArray *fonts = [NSMutableArray array];
     NSInteger indFamily, indFont;
     for (indFamily=0; indFamily<[familyNames count]; ++indFamily)
     {
         fontNames = [[NSArray alloc] initWithArray:
                      [UIFont fontNamesForFamilyName:
                       [familyNames objectAtIndex:indFamily]]];
-        fonts.addObjectsFromArray(fontNames);
-        [fontNames release];
+        [fonts addObjectsFromArray:fontNames];
     }
 
-    if (fonts != nil && [fonts length] > 0) {
+    if (fonts != nil) {
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:fonts];
     } else {
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];