mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
minor cleanup
This commit is contained in:
parent
376b386b31
commit
4ff068db0a
@ -1,4 +1,5 @@
|
|||||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
|
<s:Int64 x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/KeywordCompletionMinLength/@EntryValue">0</s:Int64>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">ERROR</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">ERROR</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToReturnStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToReturnStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
@ -8,11 +9,30 @@
|
|||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NUnit_002ENonPublicMethodWithTestAttribute/@EntryIndexedValue">ERROR</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NUnit_002ENonPublicMethodWithTestAttribute/@EntryIndexedValue">ERROR</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReturnTypeCanBeEnumerable_002EGlobal/@EntryIndexedValue">HINT</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReturnTypeCanBeEnumerable_002EGlobal/@EntryIndexedValue">HINT</s:String>
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">HINT</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">HINT</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=NzbDrone/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="NzbDrone"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>IMPLICIT_EXCEPT_SIMPLE_TYPES</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSUpdateFileHeader>True</CSUpdateFileHeader><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReorderTypeMembers>True</CSReorderTypeMembers><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags></Profile></s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">NzbDrone</s:String>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_CHOP_COMPOUND_WHILE_EXPRESSION/@EntryValue">True</s:Boolean>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FIXED_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOR_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_FOREACH_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_IFELSE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_USING_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/FORCE_WHILE_BRACES_STYLE/@EntryValue">ALWAYS_ADD</s:String>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FIXED_STMT/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_USINGS_STMT/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SIMPLE_EMBEDDED_STATEMENT_STYLE/@EntryValue">ON_SINGLE_LINE</s:String>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AllowAlias/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/CanUseGlobalAlias/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/PreferQualifiedReference/@EntryValue">False</s:Boolean>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></s:String>
|
||||||
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="" Suffix="" Style="AaBb" /></Policy></s:String>
|
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="" Suffix="" Style="AaBb" /></Policy></s:String>
|
||||||
<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Position/@EntryValue">BOTH_SIDES</s:String>
|
<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Position/@EntryValue">BOTH_SIDES</s:String>
|
||||||
<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Style/@EntryValue">OUTLINE</s:String>
|
<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Style/@EntryValue">COLOR</s:String>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/ExternalSources/Decompiler/ReorderMembers/@EntryValue">True</s:Boolean>
|
||||||
<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
|
<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
|
||||||
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/@KeyIndexDefined">True</s:Boolean>
|
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/@KeyIndexDefined">True</s:Boolean>
|
||||||
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/AbsolutePath/@EntryValue">C:\Dropbox\Git\NzbDrone\NzbDrone.sln.DotSettings</s:String>
|
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=5C7F3FB135E52A44B9447C48B2EEEE92/AbsolutePath/@EntryValue">C:\Dropbox\Git\NzbDrone\NzbDrone.sln.DotSettings</s:String>
|
||||||
@ -20,6 +40,11 @@
|
|||||||
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C7F3FB135E52A44B9447C48B2EEEE92/RelativePriority/@EntryValue">1</s:Double>
|
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File5C7F3FB135E52A44B9447C48B2EEEE92/RelativePriority/@EntryValue">1</s:Double>
|
||||||
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AC_003A_005CDropbox_005CGit_005CNzbDrone_005CNzbDrone_002Esln_002EDotSettings/@KeyIndexDefined">True</s:Boolean>
|
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AC_003A_005CDropbox_005CGit_005CNzbDrone_005CNzbDrone_002Esln_002EDotSettings/@KeyIndexDefined">True</s:Boolean>
|
||||||
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AC_003A_005CDropbox_005CGit_005CNzbDrone_005CNzbDrone_002Esln_002EDotSettings/RelativePriority/@EntryValue">2</s:Double>
|
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AC_003A_005CDropbox_005CGit_005CNzbDrone_005CNzbDrone_002Esln_002EDotSettings/RelativePriority/@EntryValue">2</s:Double>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">False</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/TextControl/HighlightCurrentLine/@EntryValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=Jasmine/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=MSTest/@EntryIndexedValue">True</s:Boolean>
|
||||||
|
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=QUnit/@EntryIndexedValue">True</s:Boolean>
|
||||||
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/EntryName/@EntryValue">Backbone model</s:String>
|
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/EntryName/@EntryValue">Backbone model</s:String>
|
||||||
<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/Position/@EntryValue">5</s:Int64>
|
<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/Position/@EntryValue">5</s:Int64>
|
||||||
<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=09B531154963914B9AB9E2A05E1F2B44/@KeyIndexDefined">True</s:Boolean>
|
<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=09B531154963914B9AB9E2A05E1F2B44/@KeyIndexDefined">True</s:Boolean>
|
||||||
|
@ -44,8 +44,8 @@ define(
|
|||||||
|
|
||||||
onRender: function () {
|
onRender: function () {
|
||||||
|
|
||||||
var defaultQuality = Config.GetValue(Config.Keys.DefaultQualityProfileId);
|
var defaultQuality = Config.getValue(Config.Keys.DefaultQualityProfileId);
|
||||||
var defaultRoot = Config.GetValue(Config.Keys.DefaultRootFolderId);
|
var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId);
|
||||||
|
|
||||||
if (QualityProfiles.get(defaultQuality)) {
|
if (QualityProfiles.get(defaultQuality)) {
|
||||||
this.ui.qualityProfile.val(defaultQuality);
|
this.ui.qualityProfile.val(defaultQuality);
|
||||||
@ -84,7 +84,7 @@ define(
|
|||||||
},
|
},
|
||||||
|
|
||||||
_qualityProfileChanged: function () {
|
_qualityProfileChanged: function () {
|
||||||
Config.SetValue(Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val());
|
Config.setValue(Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val());
|
||||||
},
|
},
|
||||||
|
|
||||||
_rootFolderChanged: function () {
|
_rootFolderChanged: function () {
|
||||||
@ -93,7 +93,7 @@ define(
|
|||||||
App.modalRegion.show(this.rootFolderLayout);
|
App.modalRegion.show(this.rootFolderLayout);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Config.SetValue(Config.Keys.DefaultRootFolderId, rootFolderValue);
|
Config.setValue(Config.Keys.DefaultRootFolderId, rootFolderValue);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ define(
|
|||||||
|
|
||||||
render: function () {
|
render: function () {
|
||||||
var size = this.model.get(this.column.get('name'));
|
var size = this.model.get(this.column.get('name'));
|
||||||
this.$el.html(FormatHelpers.Bytes(size));
|
this.$el.html(FormatHelpers.bytes(size));
|
||||||
this.delegateEvents();
|
this.delegateEvents();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ define(
|
|||||||
var date = this.model.get(this.column.get('name'));
|
var date = this.model.get(this.column.get('name'));
|
||||||
|
|
||||||
if (date) {
|
if (date) {
|
||||||
this.$el.html("<span title='" + Moment(date).format('LLLL') + "' >" + FormatHelpers.DateHelper(date) + "</span");
|
this.$el.html("<span title='" + Moment(date).format('LLLL') + "' >" + FormatHelpers.dateHelper(date) + "</span");
|
||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
|
@ -12,7 +12,7 @@ define(
|
|||||||
DefaultRootFolderId: 'DefaultRootFolderId'
|
DefaultRootFolderId: 'DefaultRootFolderId'
|
||||||
},
|
},
|
||||||
|
|
||||||
GetValue: function (key, defaultValue) {
|
getValue: function (key, defaultValue) {
|
||||||
|
|
||||||
var storeValue = localStorage.getItem(key);
|
var storeValue = localStorage.getItem(key);
|
||||||
|
|
||||||
@ -23,11 +23,11 @@ define(
|
|||||||
return storeValue.toString();
|
return storeValue.toString();
|
||||||
},
|
},
|
||||||
|
|
||||||
SetValue: function (key, value) {
|
setValue: function (key, value) {
|
||||||
|
|
||||||
console.log('Config: [{0}] => [{1}] '.format(key, value));
|
console.log('Config: [{0}] => [{1}] '.format(key, value));
|
||||||
|
|
||||||
if (this.GetValue(key) === value.toString()) {
|
if (this.getValue(key) === value.toString()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ define(
|
|||||||
}
|
}
|
||||||
|
|
||||||
var date = Moment(input);
|
var date = Moment(input);
|
||||||
var result = '<span title="' + date.format('LLLL') + '">' + FormatHelpers.DateHelper(input) + '</span>';
|
var result = '<span title="' + date.format('LLLL') + '">' + FormatHelpers.dateHelper(input) + '</span>';
|
||||||
|
|
||||||
return new Handlebars.SafeString(result);
|
return new Handlebars.SafeString(result);
|
||||||
});
|
});
|
||||||
|
@ -5,7 +5,7 @@ define(
|
|||||||
'Shared/FormatHelpers'
|
'Shared/FormatHelpers'
|
||||||
], function (Handlebars, FormatHelpers) {
|
], function (Handlebars, FormatHelpers) {
|
||||||
Handlebars.registerHelper('Bytes', function (size) {
|
Handlebars.registerHelper('Bytes', function (size) {
|
||||||
return new Handlebars.SafeString(FormatHelpers.Bytes(size));
|
return new Handlebars.SafeString(FormatHelpers.bytes(size));
|
||||||
});
|
});
|
||||||
|
|
||||||
Handlebars.registerHelper('Pad2', function (input) {
|
Handlebars.registerHelper('Pad2', function (input) {
|
||||||
@ -13,7 +13,7 @@ define(
|
|||||||
});
|
});
|
||||||
|
|
||||||
Handlebars.registerHelper('Number', function (input) {
|
Handlebars.registerHelper('Number', function (input) {
|
||||||
return FormatHelpers.Number(input);
|
return FormatHelpers.number(input);
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -19,11 +19,11 @@ define(
|
|||||||
|
|
||||||
itemViewOptions: function () {
|
itemViewOptions: function () {
|
||||||
return {
|
return {
|
||||||
episodeCollection: this.episodeCollection,
|
episodeCollection: this.episodeCollection
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
appendHtml: function(collectionView, itemView, index){
|
appendHtml: function(collectionView, itemView){
|
||||||
var childrenContainer = $(collectionView.childrenContainer || collectionView.el);
|
var childrenContainer = $(collectionView.childrenContainer || collectionView.el);
|
||||||
childrenContainer.prepend(itemView.el);
|
childrenContainer.prepend(itemView.el);
|
||||||
}
|
}
|
||||||
|
@ -8,12 +8,12 @@ define(
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
||||||
Bytes: function (sourceSize) {
|
bytes: function (sourceSize) {
|
||||||
var size = Number(sourceSize);
|
var size = Number(sourceSize);
|
||||||
return Filesize(size, 1, false);
|
return Filesize(size, 1, false);
|
||||||
},
|
},
|
||||||
|
|
||||||
DateHelper: function (sourceDate) {
|
dateHelper: function (sourceDate) {
|
||||||
if (!sourceDate) {
|
if (!sourceDate) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@ -46,7 +46,7 @@ define(
|
|||||||
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
|
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
|
||||||
},
|
},
|
||||||
|
|
||||||
Number: function (input) {
|
number: function (input) {
|
||||||
if (!input) {
|
if (!input) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
@ -6,17 +6,27 @@ define(
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
||||||
startsWith: function(str, starts){
|
startsWith: function (str, starts) {
|
||||||
if (starts === '') return true;
|
if (starts === '') {
|
||||||
if (str == null || starts == null) return false;
|
return true;
|
||||||
str = String(str); starts = String(starts);
|
}
|
||||||
|
if (str == null || starts == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
str = String(str);
|
||||||
|
starts = String(starts);
|
||||||
return str.length >= starts.length && str.slice(0, starts.length) === starts;
|
return str.length >= starts.length && str.slice(0, starts.length) === starts;
|
||||||
},
|
},
|
||||||
|
|
||||||
endsWith: function(str, ends){
|
endsWith: function (str, ends) {
|
||||||
if (ends === '') return true;
|
if (ends === '') {
|
||||||
if (str == null || ends == null) return false;
|
return true;
|
||||||
str = String(str); ends = String(ends);
|
}
|
||||||
|
if (str == null || ends == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
str = String(str);
|
||||||
|
ends = String(ends);
|
||||||
return str.length >= ends.length && str.slice(str.length - ends.length) === ends;
|
return str.length >= ends.length && str.slice(str.length - ends.length) === ends;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ define(
|
|||||||
},
|
},
|
||||||
|
|
||||||
setActive: function () {
|
setActive: function () {
|
||||||
var storedKey = Config.GetValue(this.menu.menuKey, this.menu.defaultAction);
|
var storedKey = Config.getValue(this.menu.menuKey, this.menu.defaultAction);
|
||||||
|
|
||||||
this.collection.each(function (model) {
|
this.collection.each(function (model) {
|
||||||
if (model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) {
|
if (model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) {
|
||||||
|
@ -37,7 +37,7 @@ define(
|
|||||||
|
|
||||||
onClick: function () {
|
onClick: function () {
|
||||||
|
|
||||||
Config.SetValue(this.model.get('menuKey'), this.model.get('key'));
|
Config.setValue(this.model.get('menuKey'), this.model.get('key'));
|
||||||
this.invokeCallback();
|
this.invokeCallback();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user