Commit b2af6b65 authored by Porter Libby's avatar Porter Libby
Browse files

conflict

parent 724934bf
...@@ -124,7 +124,6 @@ ...@@ -124,7 +124,6 @@
</div> </div>
<!-- Block 1 --> <!-- Block 1 -->
<<<<<<< HEAD
<div class='block' id="block1"> <div class='block' id="block1">
<span class='section-prompt'>1. Type the name of a major you are interested in</span> <span class='section-prompt'>1. Type the name of a major you are interested in</span>
...@@ -160,39 +159,6 @@ ...@@ -160,39 +159,6 @@
<iframe width="560" height="315" src="https://www.youtube.com/embed/vjsbZiBVFRM" <iframe width="560" height="315" src="https://www.youtube.com/embed/vjsbZiBVFRM"
frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope;
picture-in-picture" allowfullscreen></iframe> picture-in-picture" allowfullscreen></iframe>
=======
<div id='block-1' class='block'>
<span class='section-prompt'>1. Type the name of a major you are interested in</span>
<script>
var parent = document.getElementById('block-1');
create_searchbar(parent,'major_selection');
if (!('ontouchstart' in document.documentElement)){
$("#block-1 #searchbar").keyboard({
usePreview: false,
autoAccept: true,
autoAcceptOnEsc: true,
keyBinding: 'mousedown touchstart',
accepted : function(e, keyboard, el) {
var event = new Event('input', {
bubbles: true,
cancelable: true,
});
el.dispatchEvent(event);
},
change : function(e, keyboard, el) {
var event = new Event('input', {
bubbles: true,
cancelable: true,
});
el.dispatchEvent(event);
}
}); // create virtual keyboard if touchscreen is detected
}
</script>
>>>>>>> backend
</div> </div>
<!-- Block 2 --> <!-- Block 2 -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment