http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5394af08/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index ec7ad9a..d2da4dd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -119,6 +119,7 @@ var APointer = function(wb) { function go(_cnt) { if (_cnt < 0) { canvas.remove(group); + return; } circle1.set({radius: 3}); circle2.set({radius: 6}); @@ -550,6 +551,7 @@ var Wb = function() { } ] }); + return confirm; } function internalInit() { t.draggable({ @@ -587,6 +589,9 @@ var Wb = function() { t.find('.om-icon.clear-slide').click(function() { confirmDlg('clear-slide-confirm', function() { wbAction('clearSlide', JSON.stringify({wbId: wb.id, slide: slide})); }); }); + t.find('.om-icon.save').click(function() { + wbAction('save', JSON.stringify({wbId: wb.id})); + }); s.find('.wb-prop-b, .wb-prop-i') .button() .click(function() { @@ -1140,7 +1145,7 @@ var WbArea = (function() { return res; } , activate: function(e, ui) { - wbAction('activeWb', JSON.stringify({id: ui.newTab.data('wb-id')})); + wbAction('activateWb', JSON.stringify({id: ui.newTab.data('wb-id')})); } }); scroll = tabs.find('.scroll-container'); @@ -1171,11 +1176,11 @@ var WbArea = (function() { wbo.init(obj.id, tid, readOnly); _resizeWbs(); } - self.add = function(obj) { + self.createWb = function(obj) { self.create(obj); _activateTab(obj.id); }; - self.activate = function(obj) { + self.activateWb = function(obj) { _activateTab(obj.id); } self.load = function(json) { @@ -1190,7 +1195,7 @@ var WbArea = (function() { self.modifyObj = function(json) { self.getWb(json.wbId).modifyObj(json.obj); }; - self.removeObj = function(json) { + self.deleteObj = function(json) { self.getWb(json.wbId).removeObj(json.obj); }; self.clearAll = function(json) { @@ -1200,7 +1205,7 @@ var WbArea = (function() { self.clearSlide = function(json) { self.getWb(json.wbId).clearSlide(json.slide); }; - self.remove = function(obj) { + self.removeWb = function(obj) { var tabId = self.getWbTabId(obj.id); tabs.find('li[aria-controls="' + tabId + '"]').remove(); $("#" + tabId).remove();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5394af08/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index bc68354..89a8a98 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -44,7 +44,7 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.UserContact; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.common.UserPanel; @@ -265,7 +265,7 @@ public class MessagesContactsPanel extends UserPanel { foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE)); updateMoveModel(); - final AddFolderDialog addFolder = new AddFolderDialog("addFolder") { + final NameDialog addFolder = new NameDialog("addFolder") { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5394af08/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java index 9b3192c..4026398 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java @@ -26,7 +26,7 @@ import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dto.record.RecordingContainerData; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.AddFolderDialog; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.UserPanel; import org.apache.openmeetings.web.common.tree.FileTreePanel; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -35,7 +35,7 @@ public class RecordingsPanel extends UserPanel { private static final long serialVersionUID = 1L; private final VideoPlayer video = new VideoPlayer("video"); private final VideoInfo info = new VideoInfo("info"); - private final AddFolderDialog addFolder = new AddFolderDialog("addFolder", Application.getString(712)) { + private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5394af08/openmeetings-web/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 76b78d7..973ef1c 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -7,20 +7,20 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> -<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> +<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";> <context-param> <param-name>globalScope</param-name> <param-value>default</param-value>
