Move javascript functions back to jot-header.tpl

2 files changed, 83 insertions, 84 deletions

diff --git a/view/js/main.js b/view/js/main.js
index af146cc69..f279417d9 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1470,87 +1470,3 @@ function zid(s) {
 
 	return s;
 }
-
-
-var initializeEmbedPhotoDialog = function () {
-    $('.embed-photo-selected-photo').each(function (index) {
-        $(this).removeClass('embed-photo-selected-photo');
-    });
-    getPhotoAlbumList();
-    $('#embedPhotoModalBodyAlbumDialog').off('click');
-    $('#embedPhotoModal').modal();
-};
-
-var choosePhotoFromAlbum = function (album) {
-    $.post("embedphotos/album", {name: album},
-        function(data) {
-            if (data['status']) {
-                $('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
-                $('#embedPhotoModalBodyAlbumDialog').html('\
-                        <div><ul class="nav">\n\
-                            <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-                                <i class="fa fa-chevron-left"></i>&nbsp\n\
-                                {{$modaldiffalbum}}\n\
-                                </a>\n\
-                            </li>\n\
-                        </ul><br></div>')
-                $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-                $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-                    evt.preventDefault();
-                    var image = document.getElementById(evt.target.id);
-                    if (typeof($(image).parent()[0]) !== 'undefined') {
-                        var imageparent = document.getElementById($(image).parent()[0].id);
-                        $(imageparent).toggleClass('embed-photo-selected-photo');
-                    }
-                });
-                $('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
-                $('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
-                $('#embed-photo-OKButton').click(function () {
-                    $('.embed-photo-selected-photo').each(function (index) {
-                        var href = $(this).attr('href');
-                        $.post("embedphotos/photolink", {href: href},
-                            function(ddata) {
-                                if (ddata['status']) {
-                                    addeditortext(ddata['photolink']);
-                                } else {
-                                    window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
-                                }
-                                return false;
-                            },
-                        'json');
-                    });
-                    $('#embedPhotoModalBodyAlbumDialog').html('');
-                    $('#embedPhotoModalBodyAlbumDialog').off('click');
-                    $('#embedPhotoModal').modal('hide');
-                });
-            } else {
-                window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
-            }
-            return false;
-        },
-    'json');
-};
-
-var getPhotoAlbumList = function () {
-    $.post("embedphotos/albumlist", {},
-        function(data) {
-            if (data['status']) {
-                var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-                $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
-                $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
-                for(var i=0; i<albums.length; i++) {
-                    var albumName = albums[i].text;
-                    var albumLink = '<li>';
-                    albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
-                    albumLink += '</li>';
-                    $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                }
-                $('#embedPhotoModalBodyAlbumDialog').addClass('hide');
-                $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
-            } else {
-                window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
-            }
-            return false;
-        },
-    'json');
-};
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index adb7ff433..f3dd8cafe 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -363,6 +363,89 @@ function enableOnUser(){
 	}
 
 	{{$geotag}}
+
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal();
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><ul class="nav">\n\
+                                <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </ul><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+                        }
+                    });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
+                    $('#embed-photo-OKButton').click(function () {
+                        $('.embed-photo-selected-photo').each(function (index) {
+                            var href = $(this).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                        addeditortext(ddata['photolink']);
+                                    } else {
+                                        window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+                                },
+                            'json');
+                        });
+                        $('#embedPhotoModalBodyAlbumDialog').html('');
+                        $('#embedPhotoModalBodyAlbumDialog').off('click');
+                        $('#embedPhotoModal').modal('hide');
+                    });
+                } else {
+                    window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+                        var albumLink = '<li>';
+                        albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
+                } else {
+                    window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
     
 </script>