Merge pull request #7839 from AyaMorisawa/patch-19

Remove trailing whitespaces
This commit is contained in:
Masahiro Wakame
2016-01-29 13:37:44 +09:00
7 changed files with 140 additions and 141 deletions
+19 -19
View File
@@ -535,9 +535,9 @@ declare module uiGrid {
}
export type IGridOptions = IGridOptionsOf<any>;
export interface IGridOptionsOf<TEntity> extends cellNav.IGridOptions, edit.IGridOptions, expandable.IGridOptions,
exporter.IGridOptions<TEntity>, grouping.IGridOptions, importer.IGridOptions<TEntity>,
exporter.IGridOptions<TEntity>, grouping.IGridOptions, importer.IGridOptions<TEntity>,
infiniteScroll.IGridOptions, moveColumns.IGridOptions, pagination.IGridOptions, pinning.IGridOptions,
resizeColumns.IGridOptions, rowEdit.IGridOptions, saveState.IGridOptions, selection.IGridOptions,
resizeColumns.IGridOptions, rowEdit.IGridOptions, saveState.IGridOptions, selection.IGridOptions,
treeBase.IGridOptions<TEntity>, treeView.IGridOptions {
/**
* Default time in milliseconds to throttle aggregation calcuations, defaults to 500ms
@@ -610,8 +610,8 @@ declare module uiGrid {
*/
enableFiltering?: boolean;
/**
* False by default. When enabled, this adds a settings icon in the top right of the grid,
* which floats above the column header. The menu by default gives access to show/hide columns,
* False by default. When enabled, this adds a settings icon in the top right of the grid,
* which floats above the column header. The menu by default gives access to show/hide columns,
* but can be customized to show additional actions.
* @default false
*/
@@ -1117,8 +1117,8 @@ declare module uiGrid {
export interface sortChangedHandler<TEntity> {
/**
* Sort change event callback
* @param {IGridInstance} grid instance
* Sort change event callback
* @param {IGridInstance} grid instance
* @param {IGridColumn} array of gridColumns that have sorting on them, sorted in priority order
*/
(grid: IGridInstanceOf<TEntity>, columns: Array<IGridColumnOf<TEntity>>): void;
@@ -1342,8 +1342,8 @@ declare module uiGrid {
reader.readAsText( files[0] );
}
*/
editFileChooserCallback?: (gridRow: uiGrid.IGridRowOf<TEntity>,
gridCol: IGridColumnOf<TEntity>,
editFileChooserCallback?: (gridRow: uiGrid.IGridRowOf<TEntity>,
gridCol: IGridColumnOf<TEntity>,
files: FileList) => void;
/**
* A bindable string value that is used when binding to edit controls instead of colDef.field
@@ -1558,7 +1558,7 @@ declare module uiGrid {
*/
(row: IGridRowOf<TEntity>): void;
}
/**
* GridRow settings for expandable
*/
@@ -1632,9 +1632,9 @@ declare module uiGrid {
* @param {any} value The cell value
* @returns {any} Formatted value
*/
exporterFieldCallback?: (grid: IGridInstanceOf<TEntity>,
row: uiGrid.IGridRowOf<TEntity>,
col: IGridColumnOf<TEntity>,
exporterFieldCallback?: (grid: IGridInstanceOf<TEntity>,
row: uiGrid.IGridRowOf<TEntity>,
col: IGridColumnOf<TEntity>,
value: any) => any;
/**
* A function to apply to the header displayNames before exporting. Useful for internationalisation,
@@ -2079,7 +2079,7 @@ declare module uiGrid {
* This callback can be used to change the decoded value back into a code.
* Defaults to angular.identity.
* @param {IGridInstance} grid The grid
* @param {TEntity} newObject The new object as importer has created it. Modify it and return modified
* @param {TEntity} newObject The new object as importer has created it. Modify it and return modified
* version
* @returns {TEntity} The modified object
* @default angular.identity
@@ -3218,7 +3218,7 @@ declare module uiGrid {
export interface rowCollapsedHandler<TEntity> {
/**
* Row Collapsed callback
* @param {IGridRow} row The row that was collapsed. You can also retrieve the grid from this row with
* @param {IGridRow} row The row that was collapsed. You can also retrieve the grid from this row with
* row.grid
*/
(row: IGridRowOf<TEntity>): void;
@@ -3227,7 +3227,7 @@ declare module uiGrid {
export interface rowExpandedHandler<TEntity> {
/**
* Row Expanded callback
* @param {IGridRow} row The row that was expanded. You can also retrieve the grid from this row with
* @param {IGridRow} row The row that was expanded. You can also retrieve the grid from this row with
* row.grid
*/
(row: IGridRowOf<TEntity>): void;
@@ -3429,7 +3429,7 @@ declare module uiGrid {
new(entity: TEntity, index: number, reference: IGridInstanceOf<TEntity>): IGridRowOf<TEntity>;
}
export type IGridRow = IGridRowOf<any>;
export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow,
export interface IGridRowOf<TEntity> extends cellNav.IGridRow, edit.IGridRow, exporter.IGridRow,
selection.IGridRow, expandable.IGridRow {
/** A reference to an item in gridOptions.data[] */
entity: TEntity;
@@ -3611,7 +3611,7 @@ declare module uiGrid {
*/
export type IColumnDef = IColumnDefOf<any>;
export interface IColumnDefOf<TEntity> extends cellNav.IColumnDef, edit.IColumnDef<TEntity>, exporter.IColumnDef,
grouping.IColumnDef, moveColumns.IColumnDef, pinning.IColumnDef, resizeColumns.IColumnDef,
grouping.IColumnDef, moveColumns.IColumnDef, pinning.IColumnDef, resizeColumns.IColumnDef,
treeBase.IColumnDef<TEntity> {
/**
* defaults to false
@@ -3767,10 +3767,10 @@ declare module uiGrid {
*/
sortCellFiltered?: boolean;
/**
*(optional) An array of sort directions, specifying the order that they should cycle through as
*(optional) An array of sort directions, specifying the order that they should cycle through as
* the user repeatedly clicks on the column heading. The default is [null, uiGridConstants.ASC, uiGridConstants.DESC].
* Null refers to the unsorted state. This does not affect the initial sort direction; use the sort property for that.
* If suppressRemoveSort is also set, the unsorted state will be skipped even if it is listed here. Each direction may
* If suppressRemoveSort is also set, the unsorted state will be skipped even if it is listed here. Each direction may
* not appear in the list more than once (e.g. [ASC, DESC, DESC] is not allowed), and the list may not be empty.*
*/
sortDirectionCycle?: Array<IUiGridConstants>;
+4 -4
View File
@@ -9,10 +9,10 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
dsr: {
default: 'substate',
params: ['param1', 'param2'],
fn: function ($dsr$) {
fn: function ($dsr$) {
return $dsr$.to;
}
}
},
onInactivate: function ($state: angular.ui.IState) {
var iAmInjectedByInjector = $state;
@@ -36,10 +36,10 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
'stateParam1': ['value1', 'value2'],
'stateParam2': 'value'
});
},
},
views: {
//named views are mandatory
'name1': {}
'name1': {}
}
};
+1 -1
View File
@@ -300,7 +300,7 @@ interface UnderscoreStringStaticExports {
* @param delimiter
*/
words(str: string): string[];
/**
* Split string by delimiter (String or RegExp).
* /\s+/ by default.
+12 -12
View File
@@ -902,12 +902,12 @@ interface UnderscoreStatic {
zip(...arrays: any[]): any[];
/**
* The opposite of zip. Given a number of arrays, returns a series of new arrays, the first
* The opposite of zip. Given a number of arrays, returns a series of new arrays, the first
* of which contains all of the first elements in the input arrays, the second of which
* contains all of the second elements, and so on. Use with apply to pass in an array
* contains all of the second elements, and so on. Use with apply to pass in an array
* of arrays
* @param arrays The arrays to unzip.
* @return Unzipped version of `arrays`.
* @return Unzipped version of `arrays`.
**/
unzip(...arrays: any[][]): any[][];
@@ -972,7 +972,7 @@ interface UnderscoreStatic {
array: _.List<T>,
value: T,
from?: number): number;
/**
* Returns the first index of an element in `array` where the predicate truth test passes
* @param array The array to search for the index of the first element where the predicate truth test passes.
@@ -984,7 +984,7 @@ interface UnderscoreStatic {
array: _.List<T>,
predicate: _.ListIterator<T, boolean>,
context?: any): number;
/**
* Returns the last index of an element in `array` where the predicate truth test passes
* @param array The array to search for the index of the last element where the predicate truth test passes.
@@ -3762,7 +3762,7 @@ interface UnderscoreStatic {
* @return True if `object` is a Function, otherwise false.
**/
isFunction(object: any): boolean;
/**
* Returns true if object inherits from an Error.
* @param object Check if this object is an Error.
@@ -4680,7 +4680,7 @@ interface Underscore<T> {
* @see _.property
**/
property(): (object: Object) => any;
/**
* Wrapped type `object`.
* @see _.propertyOf
@@ -4698,12 +4698,12 @@ interface Underscore<T> {
* @see _.isEmpty
**/
isEmpty(): boolean;
/**
* Wrapped type `object`.
* @see _.isMatch
**/
isMatch(): boolean;
isMatch(): boolean;
/**
* Wrapped type `object`.
@@ -4734,7 +4734,7 @@ interface Underscore<T> {
* @see _.isFunction
**/
isFunction(): boolean;
/**
* Wrapped type `object`.
* @see _.isError
@@ -5598,7 +5598,7 @@ interface _Chain<T> {
* @see _.property
**/
property(): _Chain<T>;
/**
* Wrapped type `object`.
* @see _.propertyOf
@@ -5616,7 +5616,7 @@ interface _Chain<T> {
* @see _.isEmpty
**/
isEmpty(): _Chain<T>;
/**
* Wrapped type `object`.
* @see _.isMatch
+5 -6
View File
@@ -41,11 +41,11 @@ interface UnityMediaPlayer {
setCanGoPrev(cangoprev:Boolean);
setCanPlay(canplay:Boolean);
setCanPause(canpause:Boolean);
}
}
interface UnityNotification {
showNotification (summary:String, body:String, iconUrl?:String);
}
}
declare class UnityIndicatorProperties {
public count:Number;
@@ -63,7 +63,7 @@ interface UnityMessagingIndicator {
removeAction(name:String);
removeActions();
onPresenceChanged(onPresenceChanged:Function);
// This is suppose to be readonly, but i'm not sure how to do this
// in a definition file.
presence:String;
@@ -72,7 +72,7 @@ interface UnityMessagingIndicator {
interface UnityLauncher {
setCount(count:number);
clearCount();
setProgress(progress:number);
clearProgress();
@@ -81,7 +81,7 @@ interface UnityMessagingIndicator {
addAction(name:String, onActionInvoked:Function);
removeAction(name:String);
removeActions();
}
}
interface Unity {
init(settings:UnitySettings);
@@ -98,4 +98,3 @@ interface Unity {
interface BrowserPublic {
getUnityObject(version:number):Unity;
}
+97 -97
View File
@@ -27,56 +27,56 @@ declare module UrbanAirshipPlugin {
/**
* Enables or disables user notifications on the device.
* This will prompt users to opt-in to notifications on iOS.
*
*
* @param enabled Set to true to enable notifications, false to disable.
* @param callback The function to call on completion.
*/
setUserNotificationsEnabled(enabled: boolean, callback: (status: string) => void): void;
/**
* Checks if user notifications are enabled or not.
*
*
* @param callback The function to call on completion.
*/
isUserNotificationsEnabled(callback: (enabled: boolean) => void): void;
/**
* Get the push identifier for the device. The channel ID is used to send
* messages to the device for testing, and is the canonical identifier for
* the device in Urban Airship.
*
*
* @param callback The function to call on completion.
*/
getChannelID(callback: (id: string) => void): void;
/**
* Returns the push message object that contains the data associated with a
* push notification. The extras dictionary can contain arbitrary key/value
* data that you use in your application.
*
*
* @param clear Set to true to clear the notification.
* @param callback The function to call on completion.
*/
getLaunchNotification(clear: boolean, callback: (push: UrbanAirshipPlugin.PushEvent) => void): void;
/**
* Enables or disables quiet time.
*
*
* @param enabled Set to true to enable quiet time, false to disable.
* @param callback The function to call on completion.
*/
setQuietTimeEnabled(enabled: boolean, callback: () => void): void;
/**
* Checks if quiet time is enabled or not.
*
*
* @param callback The function to call on completion.
*/
isQuietTimeEnabled(callback: (enabled: boolean) => void): void;
/**
* Set the quiet time for the device.
*
*
* @param startHour The start hour for quiet time.
* @param startMinute The start minute for quiet time.
* @param endHour The end hour for quiet time.
@@ -84,260 +84,260 @@ declare module UrbanAirshipPlugin {
* @param callback The function to call on completion.
*/
setQuietTime(startHour: number, startMinute: number, endHour: number, endMinute: number, callback: () => void): void;
/**
* Get the current quiet time. The quietTime object represents a timespan
* during which notifications should be silenced. The typical use case is
* to expose a preference to your users so that they can enable this setting
* and specify an interval during which they do not wish to be disturbed.
*
*
* @param callback The function to call on completion.
*/
getQuietTime(callback: (quietTime: UrbanAirshipPlugin.QuietTimeTimeSpan) => void): void;
/**
* Checks if quiet time is currently in effect.
*
*
* @param callback The function to call on completion.
*/
isInQuietTime(callback: (inQuietTime: boolean) => void): void;
/**
* (iOS Only)
*
*
* On iOS, registration for push requires specifying what
* combination of badges, sound and alerts are desired. This function
* must be explicitly called in order to begin the registration process.
*
*
* For example:
*
*
* UAirship.setNotificationTypes(UAirship.notificationType.sound |
* UAirship.notificationType.alert);
*
*
* @param bitmask The notification types to set.
* @param callback The function to call on completion.
*/
setNotificationTypes(bitmask: number, callback: () => void): void;
/**
* (iOS Only)
*
*
* Set whether the UA Autobadge feature is enabled.
*
*
* @param enabled Set to true to enable Autobadge, false to disable.
* @param callback The function to call on completion.
*/
setAutobadgeEnabled(enabled: boolean, callback: () => void): void;
/**
* (iOS Only)
*
*
* Set the current application badge number.
*
*
* @param badge The number to use for the badge.
* @param callback The function to call on completion.
*/
setBadgeNumber(badge: number, callback: () => void): void;
/**
* (iOS Only)
*
*
* Gets the current application badge number.
*
*
* @param callback The function to call on completion.
*/
getBadgeNumber(callback: (badgeNumber: number) => void): void;
/**
* (iOS Only)
*
*
* Reset the badge number to zero.
*
*
* @param callback The function to call on completion.
*/
resetBadge(callback: () => void): void;
/**
* (Android Only)
*
*
* Clears the notifications posted by the application.
*
*
* @param callback The function to call on completion.
*/
clearNotifications(callback: () => void): void;
/**
* (Android only, iOS sound settings come in the push)
*
*
* Set whether the device makes sound on push.
*
*
* @param enabled Set to true to enable sound, false to disable.
* @param callback The function to call on completion.
*/
setSoundEnabled(enabled: boolean, callback: () => void): void;
/**
* (Android Only)
*
*
* Checks if sound is enabled or not.
*
*
* @param callback The function to call on completion.
*/
isSoundEnabled(callback: (enabled: boolean) => void): void;
/**
* (Android Only)
*
*
* Set whether the device vibrates on push.
*
*
* @param enabled Set to true to enable vibration, false to disable.
* @param callback The function to call on completion.
*/
setVibrateEnabled(enabled: boolean, callback: () => void): void;
/**
* (Android Only)
*
*
* Checks if vibration is enabled or not.
*
*
* @param callback The function to call on completion.
*/
isVibrateEnabled(callback: (enabled: boolean) => void): void;
/**
* Sets tags for the device.
*
*
* @param tags An array of tags.
* @param callback The function to call on completion.
*/
setTags(tags: string[], callback: () => void): void;
/**
* Returns the tags for the device.
*
*
* @param callback The function to call on completion.
*/
getTags(callback: (tags: string[]) => void): void;
/**
* Set alias for the device.
*
*
* @param alias The alias to set for this device.
* @param callback The function to call on completion.
*/
setAlias(alias: string, callback: () => void): void;
/**
* Gets the alias for this device.
*
*
* @param callback The function to call on completion.
*/
getAlias(callback: (alias: string) => void): void;
/**
* Set the named user ID for this device.
*
*
* @param namedUser The named user ID.
* @param callback The function to call on completion.
*/
setNamedUser(namedUserId: string, callback: () => void): void;
/**
* Gets the named user ID for this device.
*
*
* @param callback The function to call on completion.
*/
getNamedUser(callback: (namedUserId: string) => void): void;
/**
* Fluent API to edit the named user tag groups by adding or removing
* tags, then applying the changes.
*
*
* For example:
*
*
* UAirship.editNamedUserTagGroups()
* .addTags("loyalty", ["platinum-member", "gold-member"])
* .removeTags("loyalty", ["silver-member", "bronze-member"])
* .apply()
*
*
* @returns The chainable API instance.
*/
editNamedUserTagGroups(): UrbanAirshipPlugin.EditNamedUserTagGroupsApi;
/**
* Fluent API to edit the channel tag groups by adding or removing tags,
* then applying the changes.
*
*
* For exmaple:
*
*
* UAirship.editChannelTagGroups()
* .addTags("loyalty", ["platinum-member", "gold-member"])
* .removeTags("loyalty", ["silver-member", "bronze-member"])
* .apply()
*/
editChannelTagGroups(): UrbanAirshipPlugin.EditChannelTagGroupsApi;
/**
* Enables or disables analytics. Disabling analytics will delete any
* locally stored events and prevent any events from uploading. Features
* that depend on analytics being enabled may not work properly if its
* disabled (reports, region triggers, location segmentation, push to
* local time).
*
*
* @param enabled Set to true to enable analytics, false to disable.
* @param callback The function to call on completion.
*/
setAnalyticsEnabled(enabled: boolean, callback: () => void): void;
/**
* Checks if analytics is enabled or not.
*
*
* @param callback The function to call on completion.
*/
isAnalyticsEnabled(callback: (enabled: boolean) => void): void;
/**
* Runs an Urban Airship action.
*
*
* @param actionName The name of the action to run.
* @param actionValue The value for the action.
* @param callback The function to call on completion.
*/
runAction(actionName: string, actionValue: string, callback: (result: UrbanAirshipPlugin.RunActionResult) => void): void;
/**
* Enables or disables Urban Airship location services on the device.
*
*
* @param enabled Set to true to enable location, false to disable.
* @param callback The function to call on completion.
*/
setLocationEnabled(enabled: boolean, callback: () => void): void;
/**
* Checks if location is enabled or not.
*
*
* @param callback The function to call on completion.
*/
isLocationEnabled(callback: (enabled: boolean) => void): void;
/**
* Enables or disables background location on the device.
*
*
* @param enabled Set to true to enable background location, false to disable.
* @param callback The function to call on completion.
*/
setBackgroundLocationEnabled(enabled: boolean, callback: () => void): void;
/**
* Checks if background location updates are enabled or not.
*
*
* @param callback The function to call on completion.
*/
isBackgroundLocationEnabled(callback: () => void): void;
/**
* Records the current location of the device.
*
*
* @param callback The function to call on completion.
*/
recordCurrentLocation(callback: () => void): void;
@@ -350,27 +350,27 @@ declare module UrbanAirshipPlugin {
/**
* Used to add the given tags to the given tag group.
*
*
* @param tagGroup The tag group to add tags to.
* @param tags The tags to add to the group.
*
*
* @returns The chainable API instance.
*/
addTags: (tagGroup: string, tags: string[]) => EditNamedUserTagGroupsApi;
/**
* Used to remove the given tags from the given tag group.
*
*
* @param tagGroup The tag group to remove tags from.
* @param tags The tags to remove from the group.
*
*
* @returns The chainable API instance.
*/
removeTags: (tagGroup: string, tags: string[]) => EditNamedUserTagGroupsApi;
/**
* Used to apply the changes from the chained API call.
*
*
* @param callback The optional function to call on completion.
*/
apply: (callback?: () => void) => void;
@@ -383,27 +383,27 @@ declare module UrbanAirshipPlugin {
/**
* Used to add the given tags to the given tag group.
*
*
* @param tagGroup The tag group to add tags to.
* @param tags The tags to add to the group.
*
*
* @returns The chainable API instance.
*/
addTags: (tagGroup: string, tags: string[]) => EditChannelTagGroupsApi;
/**
* Used to remove the given tags from the given tag group.
*
*
* @param tagGroup The tag group to remove tags from.
* @param tags The tags to remove from the group.
*
*
* @returns The chainable API instance.
*/
removeTags: (tagGroup: string, tags: string[]) => EditChannelTagGroupsApi;
/**
* Used to apply the changes from the chained API call.
*
*
* @param callback The optional function to call on completion.
*/
apply: (callback?: () => void) => void;
@@ -429,7 +429,7 @@ declare module UrbanAirshipPlugin {
/**
* (iOS Only)
*
*
* The push token for the device.
*/
deviceToken: string;
@@ -437,7 +437,7 @@ declare module UrbanAirshipPlugin {
/**
* Represents a timespan during which notifications should be silenced.
*
*
* For example, 10PM - 6AM would be:
* { startHour: 22, startMinute: 0, endHour: 6, endMinute: 0 }
*/
@@ -474,4 +474,4 @@ interface Document {
addEventListener(type: "urbanairship.registration", listener: (ev: UrbanAirshipPlugin.RegistrationEvent) => void, useCapture?: boolean): void;
}
//#endregion
//#endregion
+2 -2
View File
@@ -6,13 +6,13 @@
declare module "username" {
/**
* Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables.
* Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
* Falls back to `id -un` on OS X / Linux and `whoami` on Windows in the rare case none of the environment
* variables are set. The result is cached.
*
* @param callback The callback function to call asynchronously with the result.
*/
function username(callback: (err: Error, result: string) => void): void;
module username {
/**
* Tries to get the username from the LOGNAME, USER, LNAME or USERNAME environment variables. Falls back