Skip to content

Commit

Permalink
- Refactor use of jquery libraries
Browse files Browse the repository at this point in the history
  * Use local versions now rather than ones from timemachine submodule.
  * Remove unused jquery libraries
  • Loading branch information
pdille committed Feb 1, 2020
1 parent 7daa38b commit 220b7a7
Show file tree
Hide file tree
Showing 26 changed files with 33 additions and 1,075 deletions.
Binary file not shown.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-icons_222222_256x240.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-icons_2e83ff_256x240.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-icons_454545_256x240.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-icons_888888_256x240.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified css/jquery-ui/smoothness/images/ui-icons_cd0a0a_256x240.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions css/jquery-ui/smoothness/jquery-ui.custom.css
100644 → 100755

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions css/jquery.multiselect.css

This file was deleted.

34 changes: 2 additions & 32 deletions examples/webgl-timemachine/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -1187,43 +1187,12 @@ html, body {
background-color: #999;
}

.ui-multiselect-menu ul{
width: auto !important;
margin-top: -3px !important;
overflow:hidden !important;
padding-left: 6px;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

.ui-multiselect-menu li{
font-size: 17px;
line-height:1.5em !important;
border-bottom:1px solid #ccc !important;
float:left !important;
display:inline !important;
}
.ui-multiselect {
font-size: 15px;
}

.single li { width:100% !important;}
.double li { width:50% !important;}
.triple li { width:33.333% !important;}
.quad li { width:25% !important; }
.six li { width:16.666% !important; }

.ui-multiselect-menu .credit {
color: #555555;
font-size: 11px;
position: relative;
top: -2px;
right: -4px;
}

button:focus {outline:0;}

input:focus {outline:0;}
Expand Down Expand Up @@ -2505,4 +2474,5 @@ a:focus { outline:0; }
display: none;
padding: 20px;
text-transform: none;
}
}

15 changes: 8 additions & 7 deletions examples/webgl-timemachine/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />

<link href="../../css/jquery-ui/smoothness/jquery-ui.custom.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/css/snaplapse.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/css/jquery-ui/smoothness/jquery-ui.custom.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/css/defaultUI.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/css/scaleBar.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/css/customUI.css" rel="stylesheet" type="text/css" />
<link href="../../timemachine/libs/change-detect/css/change.css" media="screen" rel="stylesheet" type="text/css" />
<link href="../../js/customVideoTagControls/customVideoTagControls.css" rel="stylesheet" type="text/css" />
<link href="../../css/jquery.multiselect.css" rel="stylesheet" type="text/css" />
<link href="index.css" rel="stylesheet" type="text/css" />
<link href="Wizard.css" rel="stylesheet" type="text/css" />
<link href="StoryEditor.css" rel="stylesheet" type="text/css" />
Expand All @@ -24,8 +23,9 @@

<script src="../../timemachine/js/polyfills/touchpolyfill.min.js" type="text/javascript"></script>

<script src="../../timemachine/js/jquery/jquery.min.js" type="text/javascript"></script>
<script src="../../timemachine/js/jquery/jquery-ui.custom.min.js" type="text/javascript"></script>
<script src="../../js/jquery/jquery.min.js" type="text/javascript"></script>
<script src="../../js/jquery/jquery-migrate.min.js" type="text/javascript"></script>
<script src="../../js/jquery/jquery-ui.custom.min.js" type="text/javascript"></script>
<script src="../../timemachine/js/jquery/plugins/mouse/jquery.mousewheel.min.js" type="text/javascript"></script>
<script src="../../timemachine/js/jquery/plugins/dialogExtend/jquery.dialogextend.min.js" type="text/javascript"></script>

Expand Down Expand Up @@ -55,7 +55,6 @@
<script src="../../timemachine/js/org/gigapan/timelapse/crossdomain_api.js" type="text/javascript"></script>

<script src="../../js/customVideoTagControls/customVideoTagControls.js" type="text/javascript"></script>
<script src="../../js/jquery.multiselect.js" type="text/javascript"></script>
<script src="../../js/earcut.min.js" type="text/javascript"></script>
<script src="../../js/dat.gui.min.js"></script>
<script src="../../js/papaparse.min.js"></script>
Expand Down Expand Up @@ -3960,11 +3959,13 @@
// Copy over data attributes to selectmenu
$.widget("ui.selectmenu", $.ui.selectmenu, {
_renderItem: function(ul, item) {
var elementdata = item.element.context.dataset;
var elementdata = item.element[0].dataset;
var attributesObj = {};
Object.keys(elementdata).forEach(function(x) {
attributesObj["data-" + x] = elementdata[x];
});
// TODO: If we want to support jQueryUI > 1.11.x then we need to
// append a div to the <li>, like so: .append("<div>")
return $('<li>')
.attr(attributesObj)
.append(item.label)
Expand Down Expand Up @@ -4106,7 +4107,7 @@
$extrasVideo[0].src = "";
$extrasVideo[0].removeEventListener("loadstart", autoModeExtrasViewChangeHandler);
}
$("#extras-selector").val("select").selectmenu('refresh');
$("#extras-selector").val("select").selectmenu("refresh");
}
}).css({
'z-index': '2000',
Expand Down
8 changes: 4 additions & 4 deletions js/handlebars.min.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions js/jquery-1.10.2.min.js

This file was deleted.

1 change: 0 additions & 1 deletion js/jquery-1.10.2.min.map

This file was deleted.

Loading

0 comments on commit 220b7a7

Please sign in to comment.