Skip to content

Commit ab39d5c

Browse files
jonoomphjonoomph
committed
Renaming JS functions with lowercase first letter. A few small syntax tweaks.
1 parent 7c7667c commit ab39d5c

File tree

10 files changed

+150
-151
lines changed

10 files changed

+150
-151
lines changed

‎src/timeline/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
// Initialize Angular application
31-
/*global App, timeline*/
31+
/*global App, timeline, angular*/
3232
var App = angular.module("openshot-timeline", ["ui.bootstrap", "ngAnimate"]);
3333

3434

‎src/timeline/index.html

+15-15
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
<!-- RULER (right of screen) -->
4545
<div id="scrolling_ruler">
4646
<!-- PLAYHEAD TOP -->
47-
<div tl-playhead class="playhead playhead-top" ng-right-click="ShowPlayheadMenu(project.playhead_position)" style="left:{{(project.playhead_position * pixelsPerSecond) + playheadOffset}}px;">
47+
<div tl-playhead class="playhead playhead-top" ng-right-click="showPlayheadMenu(project.playhead_position)" style="left:{{(project.playhead_position * pixelsPerSecond) + playheadOffset}}px;">
4848
<div class="playhead-line-small"></div>
4949
</div>
5050
<!-- Ruler extends beyond tracks area at least for a width of vertical scroll bar (or more, like 50px here) -->
51-
<canvas tl-ruler id="ruler" width="{{GetTimelineWidth(1024)+50}}" height="39"></canvas>
51+
<canvas tl-ruler id="ruler" width="{{getTimelineWidth(1024) + 50}}" height="39"></canvas>
5252

5353
<!-- MARKERS -->
5454
<span class="ruler_marker" id="marker_for_{{marker.id}}">
55-
<img ng-repeat="marker in project.markers" id="marker_{{marker.id}}_{{$index}}" ng-right-click="ShowMarkerMenu(marker.id)" style="position: absolute; bottom: 0px; left: {{(marker.position * pixelsPerSecond) - 6 }}px;" class="marker_icon" ng-src="media/images/markers/{{ marker.icon }}" draggable="false"/>
55+
<img ng-repeat="marker in project.markers" id="marker_{{marker.id}}_{{$index}}" ng-right-click="showMarkerMenu(marker.id)" style="position: absolute; bottom: 0px; left: {{(marker.position * pixelsPerSecond) - 6 }}px;" class="marker_icon" ng-src="media/images/markers/{{ marker.icon }}" draggable="false"/>
5656
</span>
5757
<br class="cleared">
5858

@@ -63,29 +63,29 @@
6363

6464
<!-- TRACKS NAMES (left of screen) -->
6565
<div id="track_controls">
66-
<div ng-repeat="layer in project.layers.slice().reverse()" id="track_static_{{layer.number}}" ng-right-click="ShowTrackMenu(layer.id)" class="track_name">
66+
<div ng-repeat="layer in project.layers.slice().reverse()" id="track_static_{{layer.number}}" ng-right-click="showTrackMenu(layer.id)" class="track_name">
6767
<div class="track_top">
68-
<div tl-clip-menu class="track_menu" ng-mousedown="ShowTrackMenu(layer.id)"></div>
69-
<span class="track_label">{{GetTrackName(layer.label, project.layers.length - $index)}}</span><span ng-show="layer.lock" class="track_lock"></span>
68+
<div tl-clip-menu class="track_menu" ng-mousedown="showTrackMenu(layer.id)"></div>
69+
<span class="track_label">{{getTrackName(layer.label, project.layers.length - $index)}}</span><span ng-show="layer.lock" class="track_lock"></span>
7070
</div>
7171
</div>
7272
<br>
7373
</div>
7474
<!-- TRACKS CONTAINER (right of screen) -->
7575
<div tl-scrollable-tracks id="scrolling_tracks">
76-
<div id="track-container" tl-track tl-multi-selectable style="width: {{GetTimelineWidth(1024)}}px; padding-bottom: 2px;">
76+
<div id="track-container" tl-track tl-multi-selectable style="width: {{getTimelineWidth(1024)}}px; padding-bottom: 2px;">
7777
<!-- TRACKS -->
78-
<div ng-repeat="layer in project.layers.slice().reverse()" id="track_{{layer.number}}" ng-right-click="ShowTimelineMenu($event, layer.number)" class="{{GetTrackStyle(layer.lock)}}" style="width:{{GetTimelineWidth(1024)}}px;">
78+
<div ng-repeat="layer in project.layers.slice().reverse()" id="track_{{layer.number}}" ng-right-click="showTimelineMenu($event, layer.number)" class="{{getTrackStyle(layer.lock)}}" style="width:{{getTimelineWidth(1024)}}px;">
7979
</div>
8080

8181
<!-- CLIPS -->
82-
<div ng-hide tl-clip ng-repeat="clip in project.clips" id="clip_{{clip.id}}" ng-click="SelectClip(clip.id, true, $event)" ng-right-click="ShowClipMenu(clip.id, $event)" class="clip droppable" ng-class="getClipStyle(clip)" style="width:{{(clip.end - clip.start) * pixelsPerSecond}}px; left:{{clip.position * pixelsPerSecond}}px; top:{{getTrackTop(clip.layer)}}px;z-index:{{1000 + $index}};">
82+
<div ng-hide tl-clip ng-repeat="clip in project.clips" id="clip_{{clip.id}}" ng-click="selectClip(clip.id, true, $event)" ng-right-click="showClipMenu(clip.id, $event)" class="clip droppable" ng-class="getClipStyle(clip)" style="width:{{(clip.end - clip.start) * pixelsPerSecond}}px; left:{{clip.position * pixelsPerSecond}}px; top:{{getTrackTop(clip.layer)}}px;z-index:{{1000 + $index}};">
8383
<div class="clip_top">
84-
<div tl-clip-menu class="clip_menu" ng-show="!enable_razor" ng-mousedown="ShowClipMenu(clip.id, $event)" tooltip-enable="!enable_razor" tooltip="{{clip.title}}" tooltip-placement="bottom" tooltip-popup-delay="400"></div>
84+
<div tl-clip-menu class="clip_menu" ng-show="!enable_razor" ng-mousedown="showClipMenu(clip.id, $event)" tooltip-enable="!enable_razor" tooltip="{{clip.title}}" tooltip-placement="bottom" tooltip-popup-delay="400"></div>
8585

8686
<!-- CLIP EFFECTS -->
8787
<div ng-show="!enable_razor" class="effect-container" id="effects_{{clip.id}}">
88-
<div class="clip_effects" ng-repeat="effect in clip.effects" id="effect_{{effect.id}}" style="background-color: {{ GetEffectColor(effect.type); }};" ng-click="SelectEffect(effect.id); $event.stopPropagation();" ng-right-click="ShowEffectMenu(effect.id); $event.stopPropagation();" tooltip="{{effect.type}} ({{$index+1}}/{{clip.effects.length}})" tooltip-placement="bottom" tooltip-popup-delay="400">
88+
<div class="clip_effects" ng-repeat="effect in clip.effects" id="effect_{{effect.id}}" style="background-color: {{ getEffectColor(effect.type) }};" ng-click="selectEffect(effect.id); $event.stopPropagation();" ng-right-click="showEffectMenu(effect.id); $event.stopPropagation();" tooltip="{{effect.type}} ({{$index+1}}/{{clip.effects.length}})" tooltip-placement="bottom" tooltip-popup-delay="400">
8989
{{effect.type[0]}}
9090
</div>
9191
</div>
@@ -99,17 +99,17 @@
9999
</div>
100100
<br class="cleared">
101101
<div ng-show="!clip.show_audio" class="thumb-container">
102-
<img class="thumb thumb-start" ng-show="{{ GetThumbPath(clip) }}" ng-src="{{ GetThumbPath(clip) }}"/>
102+
<img class="thumb thumb-start" ng-show="{{ getThumbPath(clip) }}" ng-src="{{ getThumbPath(clip) }}"/>
103103
</div>
104104
<div ng-show="clip.show_audio" class="audio-container">
105105
<canvas tl-audio height="46px" width="{{ (clip.end - clip.start) * pixelsPerSecond}}px" class="audio"></canvas>
106106
</div>
107107
</div>
108108

109109
<!-- TRANSITIONS -->
110-
<div ng-hide tl-transition ng-repeat="transition in project.effects" id="transition_{{transition.id}}" ng-click="SelectTransition(transition.id, true, $event)" ng-right-click="ShowTransitionMenu(transition.id, $event)" class="transition droppable" ng-class="getClipStyle(transition)" style="width:{{ (transition.end - transition.start) * pixelsPerSecond}}px; left:{{transition.position * pixelsPerSecond}}px; top:{{getTrackTop(transition.layer)}}px;z-index:{{5000 + $index}};">
110+
<div ng-hide tl-transition ng-repeat="transition in project.effects" id="transition_{{transition.id}}" ng-click="selectTransition(transition.id, true, $event)" ng-right-click="showTransitionMenu(transition.id, $event)" class="transition droppable" ng-class="getClipStyle(transition)" style="width:{{ (transition.end - transition.start) * pixelsPerSecond}}px; left:{{transition.position * pixelsPerSecond}}px; top:{{getTrackTop(transition.layer)}}px;z-index:{{5000 + $index}};">
111111
<div class="transition_top">
112-
<div tl-clip-menu class="transition_menu" ng-show="!enable_razor" ng-mousedown="ShowTransitionMenu(transition.id, $event)"></div>
112+
<div tl-clip-menu class="transition_menu" ng-show="!enable_razor" ng-mousedown="showTransitionMenu(transition.id, $event)"></div>
113113
<!-- TRANSITION KEYFRAME POINTS -->
114114
<div ng-repeat="(point, value) in getKeyframes(transition)" id="point_{{transition.id}}_{{point}}_{{$index}}" style="left: {{(((point - 1) / (project.fps.num / project.fps.den) - transition.start) * pixelsPerSecond)}}px;" class="point_region" ng-show="transition.selected "><div class="point_icon"></div></div>
115115

@@ -135,7 +135,7 @@
135135

136136
</script>
137137

138-
<div ng-show="!Qt" class="gear" ng-click="ToggleDebug()">
138+
<div ng-show="!Qt" class="gear" ng-click="toggleDebug()">
139139
<img src="media/images/gear.png" width="40">
140140
</div>
141141

0 commit comments

Comments
 (0)