Skip to content
This repository has been archived by the owner on Apr 28, 2021. It is now read-only.

Commit

Permalink
[refine] clean up redundant lines
Browse files Browse the repository at this point in the history
  • Loading branch information
pilagod committed Feb 26, 2018
1 parent 894e7e0 commit 398b957
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 19 deletions.
1 change: 0 additions & 1 deletion src/extension/contentscriptHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ export default function (
): ContentscriptHelpers {
const contentscriptController = new ContentscriptController(store, updateSidebar)
const helpers: ContentscriptHelpers = {
// messageHandler: contentscriptController.messageHandler,
devtoolSelectionChangedHandler: contentscriptController.devtoolSelectionChangedHandler,
injectScript,
recordStoreAddMessageHandler: contentscriptController.recordStoreAddMessageHandler,
Expand Down
1 change: 0 additions & 1 deletion src/extension/private/ActionRecordStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class ScriptParser {
/* public */

public async findNode(loc: SourceLocation): Promise<ESTree.Node> {
// @TODO: remove subset node of elected one
// @NOTE: There is 1 offset of column between stacktrace and esprima
// stacktrace counts column from 1, while esprima counts column from 0
return this.finder.find(
Expand Down
8 changes: 4 additions & 4 deletions src/tracker/private/ActionRecorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ interface Recorder extends
RecorderFunctioner,
RecorderController { }

interface RecorderFunctioner {
record(action: keyof RecorderBrokers, data: ActionAddData): void;
}

interface RecorderController {
isRecording(): boolean;
startRecording(context: SourceLocation): void;
Expand All @@ -29,10 +33,6 @@ interface Broker {
process(data: ActionData): void;
}

interface RecorderFunctioner {
record(action: keyof RecorderBrokers, data: ActionAddData): void;
}

class ActionRecorder implements Recorder {

private brokers: { [role: string]: Broker } = {}
Expand Down
2 changes: 1 addition & 1 deletion src/tracker/trackers/jquery/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import trackJqueryApis from './tracker'
export default function () {
['jQuery', '$'].map((propOfJquery) => {
let value = undefined
// noConflict issue: [http://api.jquery.com/jQuery.noconflict/]
// @NOTE: noConflict issue: [http://api.jquery.com/jQuery.noconflict/]
Reflect.defineProperty(window, propOfJquery, {
set: function (obj) {
if (isJquery(obj) && !isTracked(obj)) {
Expand Down
13 changes: 6 additions & 7 deletions src/tracker/trackers/jquery/tracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function trackAnimationExitPoint() {

function trackStop(stop) {
// @NOTE: stop will trigger animation promise always handlers to do
// some operations, which are not out target
// some operations, which are not our target
jquery.prototype.stop = packActionInNonTrackingContext(function (...args) {
return stop.apply(this, args)
})
Expand All @@ -123,12 +123,12 @@ function trackEventTriggers() {
Reflect.defineProperty(jquery.event, 'triggered', {
set: function (value) {
if (value) {
// @NOTE: native trigger is about to begin, take out messages
// before trigger record process to give native trigger a right source
// @NOTE: native trigger is about to begin, restore ActionRecorder snapshot
// to make native trigger actions included in jQuery API
ActionRecorder.restoreSnapshot()
} else {
// @NOTE: native trigger is about to end, put back messages to
// continue trigger restore process
// @NOTE: native trigger is about to end, save ActionRecorder snapshot
// to start a new context for upcoming triggered actions
ActionRecorder.saveSnapshot()
}
triggered = value
Expand All @@ -138,9 +138,8 @@ function trackEventTriggers() {
}
})
}

// @NOTE: all trigger methods, like click and mouseenter, are all based on trigger
function trackEventTrigger(trigger) {
// @NOTE: all trigger methods, like click and mouseenter, are all based on trigger
const isolatedTrigger =
packActionInIsolatedContext(trigger)

Expand Down
5 changes: 0 additions & 5 deletions src/tracker/trackers/jquery/trackerHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@ export function packAnimInGivenContextOnce(
)
return new Proxy(animFunc, {
apply: function (target, thisArg, argumentList) {
// @NOTE: when this function is called while queueing (MessageBroker is not empty),
// it should not send any ActionContextMessage
const result = trackedAnimFunc.apply(thisArg, argumentList)
// const result = ActionRecorder.isRecording()
// ? target.apply(thisArg, argumentList)
// : packActionInGivenContext(target, context).apply(thisArg, argumentList)
// @NOTE: reset animFunc and ignore already tracked actions (track only once)
this.apply = packActionInNonTrackingContext(function (target, thisArg, argumentList) {
return target.apply(thisArg, argumentList)
Expand Down

0 comments on commit 398b957

Please sign in to comment.