Merge pull request CoderMJLee#145 from Jianing93/master

CoderMJLee · CoderMJLee · commit c32f350a4b96 · 2015-07-27T20:31:46.000+08:00
修改拼写错误
diff --git a/MJExtension/NSObject+MJKeyValue.m b/MJExtension/NSObject+MJKeyValue.m
@@ -12,7 +12,7 @@
 #import "MJType.h"
 #import "MJExtensionConst.h"
 #import "MJFoundation.h"
-#import "NSString+MJExtensino.h"
+#import "NSString+MJExtension.h"
 
 @implementation NSObject (MJKeyValue)
 
diff --git a/MJExtension/NSObject+MJProperty.h b/MJExtension/NSObject+MJProperty.h
@@ -29,7 +29,7 @@ typedef NSString * (^MJReplacedKeyFromPropertyName121)(NSString *propertyName);
 /** 数组中需要转换的模型类 */
 typedef NSDictionary * (^MJObjectClassInArray)();
 /** 用于过滤字典中的值 */
-typedef id (^MJNewValueFormOldValue)(id object, id oldValue, MJProperty *property);
+typedef id (^MJNewValueFromOldValue)(id object, id oldValue, MJProperty *property);
 
 /** 这个数组中的属性名才会进行字典和模型的转换 */
 typedef NSArray * (^MJAllowedPropertyNames)();
@@ -60,7 +60,7 @@ typedef NSArray * (^MJIgnoredCodingPropertyNames)();
  *
  *  @param newValueFormOldValue 用于过滤字典中的值
  */
-+ (void)setupNewValueFormOldValue:(MJNewValueFormOldValue)newValueFormOldValue;
++ (void)setupNewValueFormOldValue:(MJNewValueFromOldValue)newValueFormOldValue;
 + (id)getNewValueFormOldValue:(__weak id)oldValue object:(__weak id)object property:(__weak MJProperty *)property;
 
 #pragma mark - key配置
diff --git a/MJExtension/NSObject+MJProperty.m b/MJExtension/NSObject+MJProperty.m
@@ -198,7 +198,7 @@ + (NSMutableArray *)properties
 }
 
 #pragma mark - 新值配置
-+ (void)setupNewValueFormOldValue:(MJNewValueFormOldValue)newValueFormOldValue
++ (void)setupNewValueFormOldValue:(MJNewValueFromOldValue)newValueFormOldValue
 {
     objc_setAssociatedObject(self, &MJNewValueFromOldValueKey, newValueFormOldValue, OBJC_ASSOCIATION_COPY_NONATOMIC);
 }
@@ -207,7 +207,7 @@ + (id)getNewValueFormOldValue:(__weak id)oldValue object:(__weak id)object prope
 {
     __block id newValue = nil;
     [self enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {
-        MJNewValueFormOldValue block = objc_getAssociatedObject(c, &MJNewValueFromOldValueKey);
+        MJNewValueFromOldValue block = objc_getAssociatedObject(c, &MJNewValueFromOldValueKey);
         if (block) {
             newValue = block(object, oldValue, property);
             *stop = YES;

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ + (NSMutableArray *)properties`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`#pragma mark - 新值配置`
`201`		`-+ (void)setupNewValueFormOldValue:(MJNewValueFormOldValue)newValueFormOldValue`
	`201`	`++ (void)setupNewValueFormOldValue:(MJNewValueFromOldValue)newValueFormOldValue`
`202`	`202`	`{`
`203`	`203`	`objc_setAssociatedObject(self, &MJNewValueFromOldValueKey, newValueFormOldValue, OBJC_ASSOCIATION_COPY_NONATOMIC);`
`204`	`204`	`}`
`@@ -207,7 +207,7 @@ + (id)getNewValueFormOldValue:(__weak id)oldValue object:(__weak id)object prope`
`207`	`207`	`{`
`208`	`208`	`__block id newValue = nil;`
`209`	`209`	`[self enumerateAllClasses:^(__unsafe_unretained Class c, BOOL *stop) {`
`210`		`- MJNewValueFormOldValue block = objc_getAssociatedObject(c, &MJNewValueFromOldValueKey);`
	`210`	`+ MJNewValueFromOldValue block = objc_getAssociatedObject(c, &MJNewValueFromOldValueKey);`
`211`	`211`	`if (block) {`
`212`	`212`	`newValue = block(object, oldValue, property);`
`213`	`213`	`*stop = YES;`