Skip to content

Commit

Permalink
Version 15:
Browse files Browse the repository at this point in the history
* AVI Export feature complete.
* Export as AVI is now an option in the clip list context menu and in the clip properties panel.
* Export as AVI buttons are hidden in browsers which do not support it.
* Fixed a bug where the currently open clip could sometimes not appear in the clip list after updating the list.
* Modified wdContextMenu library to allow "skip" type items as a convenience for menus with optional items in them.
  • Loading branch information
bp2008 committed May 19, 2018
1 parent 22ca10d commit aeed9d6
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 42 deletions.
2 changes: 1 addition & 1 deletion ui3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
};
</script>
<script type="text/javascript">
var ui_version = "14";
var ui_version = "15";
var bi_version = "%%VERSION%%";
var combined_version = ui_version + "-" + bi_version;
//if (!!navigator.userAgent.match(/ Android /))
Expand Down
7 changes: 5 additions & 2 deletions ui3/libs-src/wdContextMenu/jquery.contextmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
var gTemplet = $("<div/>").addClass("b-m-mpanel").attr("unselectable", "on").css("display", "none");
var iTemplet = $("<div/>").addClass("b-m-item").attr("unselectable", "on");
var sTemplet = $("<div/>").addClass("b-m-split");
var nTemplet = $('<div style="display:none"/>').addClass("b-m-none");
var suppressCloseByDocClick = false;
function preventCloseByDocClick()
{
Expand Down Expand Up @@ -87,7 +88,9 @@
var tmp = null;
for (var i = 0; i < items.length; i++)
{
if (items[i].type == "splitLine")
if (items[i].type == "skip")
tmp = nTemplet.clone()[0];
else if (items[i].type == "splitLine")
{
//split line
tmp = sTemplet.clone()[0];
Expand Down Expand Up @@ -275,7 +278,7 @@
{
applyRule(option.rule);
}
gTemplet = iTemplet = sTemplet = itemTpl = buildGroup = buildItem = null;
gTemplet = iTemplet = sTemplet = nTemplet = itemTpl = buildGroup = buildItem = null;
addItems = overItem = outItem = null;
me.hideAll = function ()
{
Expand Down
14 changes: 7 additions & 7 deletions ui3/libs-ui3.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ui3/ui3.css
Original file line number Diff line number Diff line change
Expand Up @@ -3798,6 +3798,7 @@ div::-webkit-scrollbar-corner
position: relative;
display: flex;
flex-direction: column;
min-width: 50px;
}

.clipExportDuration
Expand Down
Loading

0 comments on commit aeed9d6

Please sign in to comment.